samples/guiAndGfx/bitmapsAndKB: Replaced graphics with public domain images

diff --git a/samples/guiAndGfx/bitmapsAndKB/KBController/controller.ec b/samples/guiAndGfx/bitmapsAndKB/KBController/controller.ec
index 72da700..44604e6 100644 (file)
--- a/samples/guiAndGfx/bitmapsAndKB/KBController/controller.ec
+++ b/samples/guiAndGfx/bitmapsAndKB/KBController/controller.ec
@@ -1,12 +1,12 @@
 import "ecere"
 
-BitmapResource peasantGfx { ":peasant.png" };
+BitmapResource knightGfx { ":knight.png" };
 BitmapResource dragonGfx { ":dragon.png" };
 BitmapResource mageGfx { ":mage.png" };
 BitmapResource archerGfx { ":archer.png" };
 BitmapResource castleGfx { ":castle.png" };
 
-Array<BitmapResource> gfxResources { [ peasantGfx, dragonGfx, mageGfx, archerGfx, castleGfx ] };
+Array<BitmapResource> gfxResources { [ knightGfx, dragonGfx, mageGfx, archerGfx, castleGfx ] };
 
 class WorldObject
 {
@@ -33,7 +33,7 @@ public:
    int x, y;
 }
 
-class Peasant : WorldObject { res = peasantGfx; selectable = true; }
+class Knight : WorldObject { res = knightGfx; selectable = true; }
 class Dragon : WorldObject { res = dragonGfx; }
 class Mage : WorldObject { res = mageGfx; selectable = true; }
 class Archer : WorldObject { res = archerGfx; selectable = true; }
@@ -44,8 +44,8 @@ Array<WorldObject> objects
    Castle { 180, 150 },
    Mage { 50, 50 },
    Archer { 150, 250 },
-   Peasant { 380, 290 },
-   Peasant { 120, 150 },
+   Knight { 380, 290 },
+   Knight { 120, 150 },
    Dragon { 320, 50 }
 ] };
 

diff --git a/samples/guiAndGfx/bitmapsAndKB/KBController/controller.epj b/samples/guiAndGfx/bitmapsAndKB/KBController/controller.epj
index 9b880bc..a120217 100644 (file)
--- a/samples/guiAndGfx/bitmapsAndKB/KBController/controller.epj
+++ b/samples/guiAndGfx/bitmapsAndKB/KBController/controller.epj
@@ -40,6 +40,6 @@
       "../res/castle.png",
       "../res/dragon.png",
       "../res/mage.png",
-      "../res/peasant.png"
+      "../res/knight.png"
    ]
 }

diff --git a/samples/guiAndGfx/bitmapsAndKB/KBOnKeyHit/OnKeyHit.ec b/samples/guiAndGfx/bitmapsAndKB/KBOnKeyHit/OnKeyHit.ec
index 7513388..461980b 100644 (file)
--- a/samples/guiAndGfx/bitmapsAndKB/KBOnKeyHit/OnKeyHit.ec
+++ b/samples/guiAndGfx/bitmapsAndKB/KBOnKeyHit/OnKeyHit.ec
@@ -1,12 +1,12 @@
 import "ecere"
 
-BitmapResource peasantGfx { ":peasant.png" };
+BitmapResource knightGfx { ":knight.png" };
 BitmapResource dragonGfx { ":dragon.png" };
 BitmapResource mageGfx { ":mage.png" };
 BitmapResource archerGfx { ":archer.png" };
 BitmapResource castleGfx { ":castle.png" };
 
-Array<BitmapResource> gfxResources { [ peasantGfx, dragonGfx, mageGfx, archerGfx, castleGfx ] };
+Array<BitmapResource> gfxResources { [ knightGfx, dragonGfx, mageGfx, archerGfx, castleGfx ] };
 
 class WorldObject
 {
@@ -33,7 +33,7 @@ public:
    int x, y;
 }
 
-class Peasant : WorldObject { res = peasantGfx; selectable = true; }
+class Knight : WorldObject { res = knightGfx; selectable = true; }
 class Dragon : WorldObject { res = dragonGfx; }
 class Mage : WorldObject { res = mageGfx; selectable = true; }
 class Archer : WorldObject { res = archerGfx; selectable = true; }
@@ -44,8 +44,8 @@ Array<WorldObject> objects
    Castle { 180, 150 },
    Mage { 50, 50 },
    Archer { 150, 250 },
-   Peasant { 380, 290 },
-   Peasant { 120, 150 },
+   Knight { 380, 290 },
+   Knight { 120, 150 },
    Dragon { 320, 50 }
 ] };
 

diff --git a/samples/guiAndGfx/bitmapsAndKB/KBOnKeyHit/OnKeyHit.epj b/samples/guiAndGfx/bitmapsAndKB/KBOnKeyHit/OnKeyHit.epj
index bad13b2..1e1bc1b 100644 (file)
--- a/samples/guiAndGfx/bitmapsAndKB/KBOnKeyHit/OnKeyHit.epj
+++ b/samples/guiAndGfx/bitmapsAndKB/KBOnKeyHit/OnKeyHit.epj
@@ -40,6 +40,6 @@
       "../res/castle.png",
       "../res/dragon.png",
       "../res/mage.png",
-      "../res/peasant.png"
+      "../res/knight.png"
    ]
 }

diff --git a/samples/guiAndGfx/bitmapsAndKB/KBState/KBState.ec b/samples/guiAndGfx/bitmapsAndKB/KBState/KBState.ec
index 1b992a8..adf62b7 100644 (file)
--- a/samples/guiAndGfx/bitmapsAndKB/KBState/KBState.ec
+++ b/samples/guiAndGfx/bitmapsAndKB/KBState/KBState.ec
@@ -1,12 +1,12 @@
 import "ecere"
 
-BitmapResource peasantGfx { ":peasant.png" };
+BitmapResource knightGfx { ":knight.png" };
 BitmapResource dragonGfx { ":dragon.png" };
 BitmapResource mageGfx { ":mage.png" };
 BitmapResource archerGfx { ":archer.png" };
 BitmapResource castleGfx { ":castle.png" };
 
-Array<BitmapResource> gfxResources { [ peasantGfx, dragonGfx, mageGfx, archerGfx, castleGfx ] };
+Array<BitmapResource> gfxResources { [ knightGfx, dragonGfx, mageGfx, archerGfx, castleGfx ] };
 
 class WorldObject
 {
@@ -33,7 +33,7 @@ public:
    int x, y;
 }
 
-class Peasant : WorldObject { res = peasantGfx; selectable = true; }
+class Knight : WorldObject { res = knightGfx; selectable = true; }
 class Dragon : WorldObject { res = dragonGfx; }
 class Mage : WorldObject { res = mageGfx; selectable = true; }
 class Archer : WorldObject { res = archerGfx; selectable = true; }
@@ -44,8 +44,8 @@ Array<WorldObject> objects
    Castle { 180, 150 },
    Mage { 50, 50 },
    Archer { 150, 250 },
-   Peasant { 380, 290 },
-   Peasant { 120, 150 },
+   Knight { 380, 290 },
+   Knight { 120, 150 },
    Dragon { 320, 50 }
 ] };
 

diff --git a/samples/guiAndGfx/bitmapsAndKB/KBState/KBState.epj b/samples/guiAndGfx/bitmapsAndKB/KBState/KBState.epj
index b65c393..e70b2e8 100644 (file)
--- a/samples/guiAndGfx/bitmapsAndKB/KBState/KBState.epj
+++ b/samples/guiAndGfx/bitmapsAndKB/KBState/KBState.epj
@@ -40,6 +40,6 @@
       "../res/castle.png",
       "../res/dragon.png",
       "../res/mage.png",
-      "../res/peasant.png"
+      "../res/knight.png"
    ]
 }

diff --git a/samples/guiAndGfx/bitmapsAndKB/Objects/objects.ec b/samples/guiAndGfx/bitmapsAndKB/Objects/objects.ec
index a913417..9832bb4 100644 (file)
--- a/samples/guiAndGfx/bitmapsAndKB/Objects/objects.ec
+++ b/samples/guiAndGfx/bitmapsAndKB/Objects/objects.ec
@@ -1,12 +1,12 @@
 import "ecere"
 
-BitmapResource peasantGfx { ":peasant.png" };
+BitmapResource knightGfx { ":knight.png" };
 BitmapResource dragonGfx { ":dragon.png" };
 BitmapResource mageGfx { ":mage.png" };
 BitmapResource archerGfx { ":archer.png" };
 BitmapResource castleGfx { ":castle.png" };
 
-Array<BitmapResource> gfxResources { [ peasantGfx, dragonGfx, mageGfx, archerGfx, castleGfx ] };
+Array<BitmapResource> gfxResources { [ knightGfx, dragonGfx, mageGfx, archerGfx, castleGfx ] };
 
 class WorldObject
 {
@@ -23,7 +23,7 @@ public:
    int x, y;
 }
 
-class Peasant : WorldObject { res = peasantGfx; }
+class Knight : WorldObject { res = knightGfx; }
 class Dragon : WorldObject { res = dragonGfx; }
 class Mage : WorldObject { res = mageGfx; }
 class Archer : WorldObject { res = archerGfx; }
@@ -34,14 +34,14 @@ Array<WorldObject> objects
    Castle { 180, 150 },
    Mage { 50, 50 },
    Archer { 150, 250 },
-   Peasant { 380, 290 },
-   Peasant { 120, 150 },
+   Knight { 380, 290 },
+   Knight { 120, 150 },
    Dragon { 320, 50 }
 ] };
 
 class MainWindow : Window
 {
-   text = "A World of Objects";
+   caption = $"A World of Objects";
    background = black;
    borderStyle = sizable;
    hasMaximize = true;

diff --git a/samples/guiAndGfx/bitmapsAndKB/Objects/objects.epj b/samples/guiAndGfx/bitmapsAndKB/Objects/objects.epj
index 6b448a3..1f5cd05 100644 (file)
--- a/samples/guiAndGfx/bitmapsAndKB/Objects/objects.epj
+++ b/samples/guiAndGfx/bitmapsAndKB/Objects/objects.epj
@@ -40,6 +40,6 @@
       "../res/castle.png",
       "../res/dragon.png",
       "../res/mage.png",
-      "../res/peasant.png"
+      "../res/knight.png"
    ]
 }

diff --git a/samples/guiAndGfx/bitmapsAndKB/res/archer.png b/samples/guiAndGfx/bitmapsAndKB/res/archer.png
index ed9ad38..524fa16 100644 (file)
Binary files a/samples/guiAndGfx/bitmapsAndKB/res/archer.png and b/samples/guiAndGfx/bitmapsAndKB/res/archer.png differ

diff --git a/samples/guiAndGfx/bitmapsAndKB/res/castle.png b/samples/guiAndGfx/bitmapsAndKB/res/castle.png
index 5601b4d..eed61d2 100644 (file)
Binary files a/samples/guiAndGfx/bitmapsAndKB/res/castle.png and b/samples/guiAndGfx/bitmapsAndKB/res/castle.png differ

diff --git a/samples/guiAndGfx/bitmapsAndKB/res/dragon.png b/samples/guiAndGfx/bitmapsAndKB/res/dragon.png
index 73f63f5..9b8a484 100644 (file)
Binary files a/samples/guiAndGfx/bitmapsAndKB/res/dragon.png and b/samples/guiAndGfx/bitmapsAndKB/res/dragon.png differ

diff --git a/samples/guiAndGfx/bitmapsAndKB/res/knight.png b/samples/guiAndGfx/bitmapsAndKB/res/knight.png
new file mode 100644 (file)
index 0000000..db43401
Binary files /dev/null and b/samples/guiAndGfx/bitmapsAndKB/res/knight.png differ

diff --git a/samples/guiAndGfx/bitmapsAndKB/res/mage.png b/samples/guiAndGfx/bitmapsAndKB/res/mage.png
index 9fd81fb..4fbfadd 100644 (file)
Binary files a/samples/guiAndGfx/bitmapsAndKB/res/mage.png and b/samples/guiAndGfx/bitmapsAndKB/res/mage.png differ

diff --git a/samples/guiAndGfx/bitmapsAndKB/res/mountain.png b/samples/guiAndGfx/bitmapsAndKB/res/mountain.png
new file mode 100644 (file)
index 0000000..47c6646
Binary files /dev/null and b/samples/guiAndGfx/bitmapsAndKB/res/mountain.png differ

diff --git a/samples/guiAndGfx/bitmapsAndKB/res/mountains.png b/samples/guiAndGfx/bitmapsAndKB/res/mountains.png
new file mode 100644 (file)
index 0000000..82fbb3f
Binary files /dev/null and b/samples/guiAndGfx/bitmapsAndKB/res/mountains.png differ

diff --git a/samples/guiAndGfx/bitmapsAndKB/res/peasant.png b/samples/guiAndGfx/bitmapsAndKB/res/peasant.png
deleted file mode 100644 (file)
index b3575a4..0000000
Binary files a/samples/guiAndGfx/bitmapsAndKB/res/peasant.png and /dev/null differ

diff --git a/samples/guiAndGfx/bitmapsAndKB/res/tree.png b/samples/guiAndGfx/bitmapsAndKB/res/tree.png
new file mode 100644 (file)
index 0000000..05efadc
Binary files /dev/null and b/samples/guiAndGfx/bitmapsAndKB/res/tree.png differ