diff --git a/sprites/Circle.png b/sprites/Circle.png deleted file mode 100644 index 1c486c8..0000000 Binary files a/sprites/Circle.png and /dev/null differ diff --git a/sprites/DefaultNode.png b/sprites/DefaultNode.png deleted file mode 100644 index 16df145..0000000 Binary files a/sprites/DefaultNode.png and /dev/null differ diff --git a/sprites/ShadowBorder.png b/sprites/ShadowBorder.png new file mode 100644 index 0000000..a52118a Binary files /dev/null and b/sprites/ShadowBorder.png differ diff --git a/sprites/ShadowCorner.png b/sprites/ShadowCorner.png new file mode 100644 index 0000000..0fac1f8 Binary files /dev/null and b/sprites/ShadowCorner.png differ diff --git a/sprites/buttons/PowerOff.png b/sprites/buttons/PowerOff.png new file mode 100644 index 0000000..9543884 Binary files /dev/null and b/sprites/buttons/PowerOff.png differ diff --git a/sprites/buttons/PowerOn.png b/sprites/buttons/PowerOn.png new file mode 100644 index 0000000..cf253df Binary files /dev/null and b/sprites/buttons/PowerOn.png differ diff --git a/sprites/icons/Card.png b/sprites/icons/Card.png new file mode 100644 index 0000000..930b6d7 Binary files /dev/null and b/sprites/icons/Card.png differ diff --git a/sprites/icons/ComponentBus.png b/sprites/icons/ComponentBus.png new file mode 100644 index 0000000..339e990 Binary files /dev/null and b/sprites/icons/ComponentBus.png differ diff --git a/sprites/icons/EEPROM.png b/sprites/icons/EEPROM.png new file mode 100644 index 0000000..57b6334 Binary files /dev/null and b/sprites/icons/EEPROM.png differ diff --git a/sprites/icons/Floppy.png b/sprites/icons/Floppy.png new file mode 100644 index 0000000..62b9050 Binary files /dev/null and b/sprites/icons/Floppy.png differ diff --git a/sprites/icons/HDD.png b/sprites/icons/HDD.png new file mode 100644 index 0000000..c973418 Binary files /dev/null and b/sprites/icons/HDD.png differ diff --git a/sprites/icons/Memory.png b/sprites/icons/Memory.png new file mode 100644 index 0000000..d13f3b9 Binary files /dev/null and b/sprites/icons/Memory.png differ diff --git a/sprites/icons/NA.png b/sprites/icons/NA.png new file mode 100644 index 0000000..a1f35bf Binary files /dev/null and b/sprites/icons/NA.png differ diff --git a/sprites/icons/RackMountable.png b/sprites/icons/RackMountable.png new file mode 100644 index 0000000..94a2e64 Binary files /dev/null and b/sprites/icons/RackMountable.png differ diff --git a/sprites/icons/Tier0.png b/sprites/icons/Tier0.png new file mode 100644 index 0000000..7fd7ebc Binary files /dev/null and b/sprites/icons/Tier0.png differ diff --git a/sprites/icons/Tier1.png b/sprites/icons/Tier1.png new file mode 100644 index 0000000..7e8cf0d Binary files /dev/null and b/sprites/icons/Tier1.png differ diff --git a/sprites/icons/Tier2.png b/sprites/icons/Tier2.png new file mode 100644 index 0000000..2a45d44 Binary files /dev/null and b/sprites/icons/Tier2.png differ diff --git a/sprites/icons/cpu.png b/sprites/icons/cpu.png new file mode 100644 index 0000000..d149dd6 Binary files /dev/null and b/sprites/icons/cpu.png differ diff --git a/sprites/items/APU0.png b/sprites/items/APU0.png new file mode 100644 index 0000000..a424643 Binary files /dev/null and b/sprites/items/APU0.png differ diff --git a/sprites/items/APU1.png b/sprites/items/APU1.png new file mode 100644 index 0000000..bc7a838 Binary files /dev/null and b/sprites/items/APU1.png differ diff --git a/sprites/items/APU2.png b/sprites/items/APU2.png new file mode 100644 index 0000000..4a09b42 Binary files /dev/null and b/sprites/items/APU2.png differ diff --git a/sprites/items/CPU0.png b/sprites/items/CPU0.png new file mode 100644 index 0000000..832c6eb Binary files /dev/null and b/sprites/items/CPU0.png differ diff --git a/sprites/items/CPU1.png b/sprites/items/CPU1.png new file mode 100644 index 0000000..9e947f4 Binary files /dev/null and b/sprites/items/CPU1.png differ diff --git a/sprites/items/CPU2.png b/sprites/items/CPU2.png new file mode 100644 index 0000000..77f5f5f Binary files /dev/null and b/sprites/items/CPU2.png differ diff --git a/sprites/items/CardBase.png b/sprites/items/CardBase.png new file mode 100644 index 0000000..f312862 Binary files /dev/null and b/sprites/items/CardBase.png differ diff --git a/sprites/items/CircuitBoard.png b/sprites/items/CircuitBoard.png new file mode 100644 index 0000000..9796fee Binary files /dev/null and b/sprites/items/CircuitBoard.png differ diff --git a/sprites/items/ComponentBus0.png b/sprites/items/ComponentBus0.png new file mode 100644 index 0000000..b5301e3 Binary files /dev/null and b/sprites/items/ComponentBus0.png differ diff --git a/sprites/items/ComponentBus1.png b/sprites/items/ComponentBus1.png new file mode 100644 index 0000000..9f476e9 Binary files /dev/null and b/sprites/items/ComponentBus1.png differ diff --git a/sprites/items/ComponentBus2.png b/sprites/items/ComponentBus2.png new file mode 100644 index 0000000..8653ef2 Binary files /dev/null and b/sprites/items/ComponentBus2.png differ diff --git a/sprites/items/ComponentBus3.png b/sprites/items/ComponentBus3.png new file mode 100644 index 0000000..8d58a78 Binary files /dev/null and b/sprites/items/ComponentBus3.png differ diff --git a/sprites/items/DataCard0.png b/sprites/items/DataCard0.png new file mode 100644 index 0000000..88cac28 Binary files /dev/null and b/sprites/items/DataCard0.png differ diff --git a/sprites/items/DataCard1.png b/sprites/items/DataCard1.png new file mode 100644 index 0000000..7fd3600 Binary files /dev/null and b/sprites/items/DataCard1.png differ diff --git a/sprites/items/DataCard2.png b/sprites/items/DataCard2.png new file mode 100644 index 0000000..c5fc946 Binary files /dev/null and b/sprites/items/DataCard2.png differ diff --git a/sprites/items/DebugCard.png b/sprites/items/DebugCard.png new file mode 100644 index 0000000..5986448 Binary files /dev/null and b/sprites/items/DebugCard.png differ diff --git a/sprites/items/DiskDriveMountable.png b/sprites/items/DiskDriveMountable.png new file mode 100644 index 0000000..7e9d1b6 Binary files /dev/null and b/sprites/items/DiskDriveMountable.png differ diff --git a/sprites/items/EEPROM.png b/sprites/items/EEPROM.png new file mode 100644 index 0000000..7dbd821 Binary files /dev/null and b/sprites/items/EEPROM.png differ diff --git a/sprites/items/FloppyDisk_dyeBlack.png b/sprites/items/FloppyDisk_dyeBlack.png new file mode 100644 index 0000000..666f4b6 Binary files /dev/null and b/sprites/items/FloppyDisk_dyeBlack.png differ diff --git a/sprites/items/FloppyDisk_dyeBlue.png b/sprites/items/FloppyDisk_dyeBlue.png new file mode 100644 index 0000000..afad476 Binary files /dev/null and b/sprites/items/FloppyDisk_dyeBlue.png differ diff --git a/sprites/items/FloppyDisk_dyeBrown.png b/sprites/items/FloppyDisk_dyeBrown.png new file mode 100644 index 0000000..be51583 Binary files /dev/null and b/sprites/items/FloppyDisk_dyeBrown.png differ diff --git a/sprites/items/FloppyDisk_dyeCyan.png b/sprites/items/FloppyDisk_dyeCyan.png new file mode 100644 index 0000000..39d0069 Binary files /dev/null and b/sprites/items/FloppyDisk_dyeCyan.png differ diff --git a/sprites/items/FloppyDisk_dyeGray.png b/sprites/items/FloppyDisk_dyeGray.png new file mode 100644 index 0000000..414cb22 Binary files /dev/null and b/sprites/items/FloppyDisk_dyeGray.png differ diff --git a/sprites/items/FloppyDisk_dyeGreen.png b/sprites/items/FloppyDisk_dyeGreen.png new file mode 100644 index 0000000..c460db9 Binary files /dev/null and b/sprites/items/FloppyDisk_dyeGreen.png differ diff --git a/sprites/items/FloppyDisk_dyeLightBlue.png b/sprites/items/FloppyDisk_dyeLightBlue.png new file mode 100644 index 0000000..1b5b48e Binary files /dev/null and b/sprites/items/FloppyDisk_dyeLightBlue.png differ diff --git a/sprites/items/FloppyDisk_dyeLightGray.png b/sprites/items/FloppyDisk_dyeLightGray.png new file mode 100644 index 0000000..439e9fa Binary files /dev/null and b/sprites/items/FloppyDisk_dyeLightGray.png differ diff --git a/sprites/items/FloppyDisk_dyeLime.png b/sprites/items/FloppyDisk_dyeLime.png new file mode 100644 index 0000000..4d72c6f Binary files /dev/null and b/sprites/items/FloppyDisk_dyeLime.png differ diff --git a/sprites/items/FloppyDisk_dyeMagenta.png b/sprites/items/FloppyDisk_dyeMagenta.png new file mode 100644 index 0000000..c719bc1 Binary files /dev/null and b/sprites/items/FloppyDisk_dyeMagenta.png differ diff --git a/sprites/items/FloppyDisk_dyeOrange.png b/sprites/items/FloppyDisk_dyeOrange.png new file mode 100644 index 0000000..2c60618 Binary files /dev/null and b/sprites/items/FloppyDisk_dyeOrange.png differ diff --git a/sprites/items/FloppyDisk_dyePink.png b/sprites/items/FloppyDisk_dyePink.png new file mode 100644 index 0000000..e743807 Binary files /dev/null and b/sprites/items/FloppyDisk_dyePink.png differ diff --git a/sprites/items/FloppyDisk_dyePurple.png b/sprites/items/FloppyDisk_dyePurple.png new file mode 100644 index 0000000..ac3748e Binary files /dev/null and b/sprites/items/FloppyDisk_dyePurple.png differ diff --git a/sprites/items/FloppyDisk_dyeRed.png b/sprites/items/FloppyDisk_dyeRed.png new file mode 100644 index 0000000..6f72861 Binary files /dev/null and b/sprites/items/FloppyDisk_dyeRed.png differ diff --git a/sprites/items/FloppyDisk_dyeWhite.png b/sprites/items/FloppyDisk_dyeWhite.png new file mode 100644 index 0000000..f51564d Binary files /dev/null and b/sprites/items/FloppyDisk_dyeWhite.png differ diff --git a/sprites/items/FloppyDisk_dyeYellow.png b/sprites/items/FloppyDisk_dyeYellow.png new file mode 100644 index 0000000..7e6fdf7 Binary files /dev/null and b/sprites/items/FloppyDisk_dyeYellow.png differ diff --git a/sprites/items/GraphicsCard0.png b/sprites/items/GraphicsCard0.png new file mode 100644 index 0000000..f37f1a7 Binary files /dev/null and b/sprites/items/GraphicsCard0.png differ diff --git a/sprites/items/GraphicsCard1.png b/sprites/items/GraphicsCard1.png new file mode 100644 index 0000000..3c26805 Binary files /dev/null and b/sprites/items/GraphicsCard1.png differ diff --git a/sprites/items/GraphicsCard2.png b/sprites/items/GraphicsCard2.png new file mode 100644 index 0000000..35f9080 Binary files /dev/null and b/sprites/items/GraphicsCard2.png differ diff --git a/sprites/items/HardDiskDrive0.png b/sprites/items/HardDiskDrive0.png new file mode 100644 index 0000000..ef3ca62 Binary files /dev/null and b/sprites/items/HardDiskDrive0.png differ diff --git a/sprites/items/HardDiskDrive1.png b/sprites/items/HardDiskDrive1.png new file mode 100644 index 0000000..2d82d9d Binary files /dev/null and b/sprites/items/HardDiskDrive1.png differ diff --git a/sprites/items/HardDiskDrive2.png b/sprites/items/HardDiskDrive2.png new file mode 100644 index 0000000..fcaffb1 Binary files /dev/null and b/sprites/items/HardDiskDrive2.png differ diff --git a/sprites/items/InternetCard.png b/sprites/items/InternetCard.png new file mode 100644 index 0000000..cda92cf Binary files /dev/null and b/sprites/items/InternetCard.png differ diff --git a/sprites/items/LinkedCard.png b/sprites/items/LinkedCard.png new file mode 100644 index 0000000..a8a4e6c Binary files /dev/null and b/sprites/items/LinkedCard.png differ diff --git a/sprites/items/Memory0.png b/sprites/items/Memory0.png new file mode 100644 index 0000000..7f37212 Binary files /dev/null and b/sprites/items/Memory0.png differ diff --git a/sprites/items/Memory1.png b/sprites/items/Memory1.png new file mode 100644 index 0000000..53efb70 Binary files /dev/null and b/sprites/items/Memory1.png differ diff --git a/sprites/items/Memory2.png b/sprites/items/Memory2.png new file mode 100644 index 0000000..d1522c9 Binary files /dev/null and b/sprites/items/Memory2.png differ diff --git a/sprites/items/Memory3.png b/sprites/items/Memory3.png new file mode 100644 index 0000000..84bbc73 Binary files /dev/null and b/sprites/items/Memory3.png differ diff --git a/sprites/items/Memory4.png b/sprites/items/Memory4.png new file mode 100644 index 0000000..a732b17 Binary files /dev/null and b/sprites/items/Memory4.png differ diff --git a/sprites/items/Memory5.png b/sprites/items/Memory5.png new file mode 100644 index 0000000..2a851fa Binary files /dev/null and b/sprites/items/Memory5.png differ diff --git a/sprites/items/NetworkCard.png b/sprites/items/NetworkCard.png new file mode 100644 index 0000000..6a0df6f Binary files /dev/null and b/sprites/items/NetworkCard.png differ diff --git a/sprites/items/RedstoneCard0.png b/sprites/items/RedstoneCard0.png new file mode 100644 index 0000000..922988e Binary files /dev/null and b/sprites/items/RedstoneCard0.png differ diff --git a/sprites/items/RedstoneCard1.png b/sprites/items/RedstoneCard1.png new file mode 100644 index 0000000..3619213 Binary files /dev/null and b/sprites/items/RedstoneCard1.png differ diff --git a/sprites/items/Server0.png b/sprites/items/Server0.png new file mode 100644 index 0000000..6c82c19 Binary files /dev/null and b/sprites/items/Server0.png differ diff --git a/sprites/items/Server1.png b/sprites/items/Server1.png new file mode 100644 index 0000000..c9b4499 Binary files /dev/null and b/sprites/items/Server1.png differ diff --git a/sprites/items/Server2.png b/sprites/items/Server2.png new file mode 100644 index 0000000..cec4e2b Binary files /dev/null and b/sprites/items/Server2.png differ diff --git a/sprites/items/Server3.png b/sprites/items/Server3.png new file mode 100644 index 0000000..30d66bd Binary files /dev/null and b/sprites/items/Server3.png differ diff --git a/sprites/items/WirelessNetworkCard0.png b/sprites/items/WirelessNetworkCard0.png new file mode 100644 index 0000000..7f10401 Binary files /dev/null and b/sprites/items/WirelessNetworkCard0.png differ diff --git a/sprites/items/WirelessNetworkCard1.png b/sprites/items/WirelessNetworkCard1.png new file mode 100644 index 0000000..09cef99 Binary files /dev/null and b/sprites/items/WirelessNetworkCard1.png differ diff --git a/sprites/Computer.png b/sprites/nodes/Computer.png similarity index 100% rename from sprites/Computer.png rename to sprites/nodes/Computer.png diff --git a/sprites/Screen.png b/sprites/nodes/Screen.png similarity index 100% rename from sprites/Screen.png rename to sprites/nodes/Screen.png diff --git a/sprites/BorderB.png b/sprites/screen/BorderB.png similarity index 100% rename from sprites/BorderB.png rename to sprites/screen/BorderB.png diff --git a/sprites/BorderT.png b/sprites/screen/BorderT.png similarity index 100% rename from sprites/BorderT.png rename to sprites/screen/BorderT.png diff --git a/sprites/CornerBL.png b/sprites/screen/CornerBL.png similarity index 100% rename from sprites/CornerBL.png rename to sprites/screen/CornerBL.png diff --git a/sprites/CornerBR.png b/sprites/screen/CornerBR.png similarity index 100% rename from sprites/CornerBR.png rename to sprites/screen/CornerBR.png diff --git a/sprites/CornerTL.png b/sprites/screen/CornerTL.png similarity index 100% rename from sprites/CornerTL.png rename to sprites/screen/CornerTL.png diff --git a/sprites/CornerTR.png b/sprites/screen/CornerTR.png similarity index 100% rename from sprites/CornerTR.png rename to sprites/screen/CornerTR.png diff --git a/sprites/window/BorderH.png b/sprites/window/BorderH.png new file mode 100644 index 0000000..dcfcd0d Binary files /dev/null and b/sprites/window/BorderH.png differ diff --git a/sprites/window/BorderV.png b/sprites/window/BorderV.png new file mode 100644 index 0000000..41e66c9 Binary files /dev/null and b/sprites/window/BorderV.png differ diff --git a/sprites/window/CornerBL.png b/sprites/window/CornerBL.png new file mode 100644 index 0000000..e448adc Binary files /dev/null and b/sprites/window/CornerBL.png differ diff --git a/sprites/window/CornerBR.png b/sprites/window/CornerBR.png new file mode 100644 index 0000000..19c1378 Binary files /dev/null and b/sprites/window/CornerBR.png differ diff --git a/sprites/window/CornerTL.png b/sprites/window/CornerTL.png new file mode 100644 index 0000000..2535c05 Binary files /dev/null and b/sprites/window/CornerTL.png differ diff --git a/sprites/window/CornerTR.png b/sprites/window/CornerTR.png new file mode 100644 index 0000000..375fa73 Binary files /dev/null and b/sprites/window/CornerTR.png differ diff --git a/src/main/resources/ocelot/desktop/spritesheet.png b/src/main/resources/ocelot/desktop/spritesheet.png index 09c0066..07d9e20 100644 Binary files a/src/main/resources/ocelot/desktop/spritesheet.png and b/src/main/resources/ocelot/desktop/spritesheet.png differ diff --git a/src/main/resources/ocelot/desktop/spritesheet.txt b/src/main/resources/ocelot/desktop/spritesheet.txt index ce7a45c..f6a5594 100644 --- a/src/main/resources/ocelot/desktop/spritesheet.txt +++ b/src/main/resources/ocelot/desktop/spritesheet.txt @@ -1,12 +1,89 @@ BackgroundPattern 0 0 304 304 -BorderB 308 25 2 8 -BorderT 305 25 2 10 -Circle 305 0 24 24 -Computer 355 0 16 16 -CornerBL 407 0 8 8 -CornerBR 416 0 8 8 -CornerTL 389 0 8 10 -CornerTR 398 0 8 10 -DefaultNode 330 0 24 24 -Empty 311 25 1 1 -Screen 372 0 16 16 +Empty 340 197 1 1 +ShadowBorder 305 197 1 24 +ShadowCorner 424 0 24 24 +buttons/PowerOff 441 25 18 18 +buttons/PowerOn 460 25 18 18 +icons/Card 479 25 16 16 +icons/ComponentBus 424 58 16 16 +icons/EEPROM 441 58 16 16 +icons/Floppy 458 58 16 16 +icons/HDD 475 58 16 16 +icons/Memory 492 58 16 16 +icons/NA 424 75 16 16 +icons/RackMountable 441 75 16 16 +icons/Tier0 458 75 16 16 +icons/Tier1 475 75 16 16 +icons/Tier2 492 75 16 16 +icons/cpu 449 0 16 16 +items/APU0 356 0 16 96 +items/APU1 373 0 16 96 +items/APU2 390 0 16 96 +items/CPU0 466 0 16 16 +items/CPU1 483 0 16 16 +items/CPU2 356 97 16 16 +items/CardBase 373 97 16 16 +items/CircuitBoard 390 97 16 16 +items/ComponentBus0 407 97 16 16 +items/ComponentBus1 424 97 16 16 +items/ComponentBus2 441 97 16 16 +items/ComponentBus3 458 97 16 16 +items/DataCard0 305 0 16 128 +items/DataCard1 322 0 16 128 +items/DataCard2 339 0 16 128 +items/DebugCard 475 97 16 16 +items/DiskDriveMountable 492 97 16 16 +items/EEPROM 305 129 16 16 +items/FloppyDisk_dyeBlack 322 129 16 16 +items/FloppyDisk_dyeBlue 339 129 16 16 +items/FloppyDisk_dyeBrown 356 129 16 16 +items/FloppyDisk_dyeCyan 373 129 16 16 +items/FloppyDisk_dyeGray 390 129 16 16 +items/FloppyDisk_dyeGreen 407 129 16 16 +items/FloppyDisk_dyeLightBlue 424 129 16 16 +items/FloppyDisk_dyeLightGray 441 129 16 16 +items/FloppyDisk_dyeLime 458 129 16 16 +items/FloppyDisk_dyeMagenta 475 129 16 16 +items/FloppyDisk_dyeOrange 492 129 16 16 +items/FloppyDisk_dyePink 305 146 16 16 +items/FloppyDisk_dyePurple 322 146 16 16 +items/FloppyDisk_dyeRed 339 146 16 16 +items/FloppyDisk_dyeWhite 356 146 16 16 +items/FloppyDisk_dyeYellow 373 146 16 16 +items/GraphicsCard0 390 146 16 16 +items/GraphicsCard1 407 146 16 16 +items/GraphicsCard2 424 146 16 16 +items/HardDiskDrive0 441 146 16 16 +items/HardDiskDrive1 458 146 16 16 +items/HardDiskDrive2 475 146 16 16 +items/InternetCard 424 25 16 32 +items/LinkedCard 407 0 16 96 +items/Memory0 492 146 16 16 +items/Memory1 305 163 16 16 +items/Memory2 322 163 16 16 +items/Memory3 339 163 16 16 +items/Memory4 356 163 16 16 +items/Memory5 373 163 16 16 +items/NetworkCard 390 163 16 16 +items/RedstoneCard0 407 163 16 16 +items/RedstoneCard1 424 163 16 16 +items/Server0 441 163 16 16 +items/Server1 458 163 16 16 +items/Server2 475 163 16 16 +items/Server3 492 163 16 16 +items/WirelessNetworkCard0 305 180 16 16 +items/WirelessNetworkCard1 322 180 16 16 +nodes/Computer 339 180 16 16 +nodes/Screen 356 180 16 16 +screen/BorderB 310 197 2 8 +screen/BorderT 307 197 2 10 +screen/CornerBL 391 180 8 8 +screen/CornerBR 400 180 8 8 +screen/CornerTL 373 180 8 10 +screen/CornerTR 382 180 8 10 +window/BorderH 333 197 1 4 +window/BorderV 335 197 4 1 +window/CornerBL 313 197 4 4 +window/CornerBR 318 197 4 4 +window/CornerTL 323 197 4 4 +window/CornerTR 328 197 4 4 diff --git a/src/main/scala/ocelot/desktop/ui/widget/ScreenWidget.scala b/src/main/scala/ocelot/desktop/ui/widget/ScreenWidget.scala index 3117baf..deb925f 100644 --- a/src/main/scala/ocelot/desktop/ui/widget/ScreenWidget.scala +++ b/src/main/scala/ocelot/desktop/ui/widget/ScreenWidget.scala @@ -109,14 +109,14 @@ class ScreenWidget(screen: Screen) extends Widget with Logging { } } - g.sprite("CornerTL", sx, sy, 16, 20) - g.sprite("CornerTR", sx + w - 16, sy, 16, 20) - g.sprite("CornerBL", sx, sy + h - 16, 16, 16) - g.sprite("CornerBR", sx + w - 16, sy + h - 16, 16, 16) - g.sprite("BorderT", sx + 16, sy + 0, w - 32, 20) - g.sprite("BorderB", sx + 16, sy + h - 16, w - 32, 16) - g.sprite("BorderB", sx + 0, sy + 20, 16, h - 36, 270) - g.sprite("BorderB", sx + w - 16, sy + 20, 16, h - 36, 270) + g.sprite("screen/CornerTL", sx, sy, 16, 20) + g.sprite("screen/CornerTR", sx + w - 16, sy, 16, 20) + g.sprite("screen/CornerBL", sx, sy + h - 16, 16, 16) + g.sprite("screen/CornerBR", sx + w - 16, sy + h - 16, 16, 16) + g.sprite("screen/BorderT", sx + 16, sy + 0, w - 32, 20) + g.sprite("screen/BorderB", sx + 16, sy + h - 16, w - 32, 16) + g.sprite("screen/BorderB", sx + 0, sy + 20, 16, h - 36, 270) + g.sprite("screen/BorderB", sx + w - 16, sy + 20, 16, h - 36, 270) g.setSmallFont() g.background = RGBAColor(0, 0, 0, 0) diff --git a/src/main/scala/ocelot/desktop/ui/workspace/ComputerNode.scala b/src/main/scala/ocelot/desktop/ui/workspace/ComputerNode.scala index 220ae81..2bee71b 100644 --- a/src/main/scala/ocelot/desktop/ui/workspace/ComputerNode.scala +++ b/src/main/scala/ocelot/desktop/ui/workspace/ComputerNode.scala @@ -2,5 +2,5 @@ package ocelot.desktop.ui.workspace class ComputerNode extends Node { override var alias: String = "Computer" - override val icon: String = "Computer" + override val icon: String = "nodes/Computer" } diff --git a/src/main/scala/ocelot/desktop/ui/workspace/Node.scala b/src/main/scala/ocelot/desktop/ui/workspace/Node.scala index 45d0ebc..d41c19c 100644 --- a/src/main/scala/ocelot/desktop/ui/workspace/Node.scala +++ b/src/main/scala/ocelot/desktop/ui/workspace/Node.scala @@ -9,7 +9,7 @@ import ocelot.desktop.util.Animation trait Node extends Widget { var alias: String - val icon: String = "DefaultNode" + val icon: String = "icons/NA" override def minimumSize: Size2D = Size2D(68, 68) diff --git a/src/main/scala/ocelot/desktop/ui/workspace/ScreenNode.scala b/src/main/scala/ocelot/desktop/ui/workspace/ScreenNode.scala index ed7cbbf..5f84798 100644 --- a/src/main/scala/ocelot/desktop/ui/workspace/ScreenNode.scala +++ b/src/main/scala/ocelot/desktop/ui/workspace/ScreenNode.scala @@ -2,5 +2,5 @@ package ocelot.desktop.ui.workspace class ScreenNode extends Node { override var alias: String = "Screen" - override val icon: String = "Screen" + override val icon: String = "nodes/Screen" }