From a62d96ad0521b064e6ef61a6f80888e27966502b Mon Sep 17 00:00:00 2001
From: Andy Belle-Isle <drumsetmonkey@gmail.com>
Date: Tue, 1 Oct 2019 02:01:20 -0400
Subject: [PATCH] Started texture based world definitions

---
 Assets/world/world1/layers/0/hitbox.png     | Bin 0 -> 3972 bytes
 Assets/world/world1/layers/0/normal.png     | Bin 0 -> 4196 bytes
 Assets/world/world1/layers/0/texture.png    | Bin 0 -> 4573 bytes
 Assets/world/world1/layers/1/hitbox.png     | Bin 0 -> 3972 bytes
 Assets/world/world1/layers/1/normal.png     | Bin 0 -> 4196 bytes
 Assets/world/world1/layers/1/texture.png    | Bin 0 -> 4573 bytes
 Assets/world/world1/layers/deco/normal.png  | Bin 0 -> 4243 bytes
 Assets/world/world1/layers/deco/texture.png | Bin 0 -> 7285 bytes
 Makefile                                    |   1 -
 Scripts/world.lua                           |  23 +++++++++-
 src/script.cpp                              |   7 ++-
 src/world.cpp                               |  25 +++++++++++
 src/world.hpp                               |  47 ++++++++++++++++++++
 13 files changed, 100 insertions(+), 3 deletions(-)
 create mode 100644 Assets/world/world1/layers/0/hitbox.png
 create mode 100644 Assets/world/world1/layers/0/normal.png
 create mode 100644 Assets/world/world1/layers/0/texture.png
 create mode 100644 Assets/world/world1/layers/1/hitbox.png
 create mode 100644 Assets/world/world1/layers/1/normal.png
 create mode 100644 Assets/world/world1/layers/1/texture.png
 create mode 100644 Assets/world/world1/layers/deco/normal.png
 create mode 100644 Assets/world/world1/layers/deco/texture.png

diff --git a/Assets/world/world1/layers/0/hitbox.png b/Assets/world/world1/layers/0/hitbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a9a37e8d2ccd31f3428e47d63d8a1cf45e35e46
GIT binary patch
literal 3972
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
H;`sjqO>Ay=

literal 0
HcmV?d00001

diff --git a/Assets/world/world1/layers/0/normal.png b/Assets/world/world1/layers/0/normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc2ede6b17d6a7f2b5b0b8ab84643562b4db3b7d
GIT binary patch
literal 4196
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

literal 0
HcmV?d00001

diff --git a/Assets/world/world1/layers/0/texture.png b/Assets/world/world1/layers/0/texture.png
new file mode 100644
index 0000000000000000000000000000000000000000..149273f21cadd69083c0a5dd759a708da706f465
GIT binary patch
literal 4573
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

literal 0
HcmV?d00001

diff --git a/Assets/world/world1/layers/1/hitbox.png b/Assets/world/world1/layers/1/hitbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a9a37e8d2ccd31f3428e47d63d8a1cf45e35e46
GIT binary patch
literal 3972
zcmeH}`BM|w7ROIQ5=cTID2qf8Fd#Z&j6x)`B^aWj5KzZ$M2L*+gRBb37C=A*L3EIP
z5d<@%PoOM>CtHg$K8sC86jX!=2u~*ZP#9nU;dRT*UobySm0i`9zMq_X>zwcT-oBmU
zEZRk*Fem^(v)^sEA3zCx#DNkC{W0cU9YzO<J_3QWy+EKJ7#!f~^MeP#`poD|>)j9d
zI<0QU%D?+Y<q%yh#ktVr`~|MB#sz1C9?HKga$M#N%zSq5chMpC#wX~d9#quwI<D(N
zw4G3R*!s-ATexSzZNInL@ckg(!0X8VMuml%6$d)*Zs9*OVP>7D=E^V7qlCt!?o@h`
zq38IW(wuW+v-grSD#NxEy^a3R)m=W~K$;~CX;-Y){Als9r=mP$z&O3C^g6wGWd<YE
zc4*h_Hdb>Giz^??Rbv+BG1KYPM9r(max`dJ;g`8TOBrwHO<5ZYYPmPdDSrJ|n%M<U
zuV&YYLV#={R$EK>k5sH+bmV;Z&zbIPh4VqGvCYF;kBzSQDWvI4t`{VZ%-&y;h1Gh-
zxc56!9>q;-y;@vFim&H4`o0=`boV$9hwnnNo=;`_AydZho>gdC<L}kRrT$j2?ti#!
zOa9;$miA>P(R*$(LiRbWX#;htAAjv&ZS5~MB0Y)O>8u8vib`B2-lH<2p}wr9Hnz)b
zZXV~eE4ZwewW$d03(0-&E<3P-gP;|<E%_u$$bq|$h5)db*o_M>=bb^JVyL~NP;r>N
zMuW~76K$(Qk#?x?NT?vd-{0d@C<uZ*PK0`#)DQCs_152I@92CuPDKm#!7+O~+i$~P
zzJL8Hc(plQxNm>?(vrtp1JO6Z>r;FBB^PUoj<X`U-l4UkeYLC6MZaGEa0RRaXRuul
zAaS#?itkvE6D4g85rpNc>eWg?wiUlT0HEvt^#r)D5Y^)E3NrCQ4O7(N&2S1YWF}{#
zNCA+0W^EW7{$oN(cI-^POl5x=$jqB?7?hok;o^r21iX_9Xuk%muqH^dXW#JB!qye;
z1*juqQP9w$s(nH}`7R9)Rc6g!Iwjj4Q>7GAc(9oPF!gd{_q<GqMTTEaG;D8EQSXoN
zRh3%$(ruzJda5=*(NMiFAwJUSHLhl-V@om(rB&Qid+%yhVp#E6g>mY5uBtK$#kQJ1
zJ~?Sj`M|3o^=R~P^wd#^tTkDGt;<!tKVe*1x<Q(-#tMb}v_!*O9Wm<tspC`>Ca$r-
zB1cS^aj|`w@$>uqalaEd-4C#{CnwFwaKiXZd7bgT1N`@V|EWt@^(0RNazjg#`i#*y
zSxS{=9*F$nTnRmOkJyh^eTl^9(Hu|_um!T-8bX~D&MSZWpwqRsgzzd9A|@tV;_me2
z55)*|?`soleiaZ=+Lt0U4&>Ay=&zL;aEnV^MUN`66=3Iy$7GN+X+5`8-2s-L*k}fl
zjYnhf%saeR-L$zlQ^oPoZ=)2j(7<)6PU5?H9@;d?fL2Zth9J-^)d>R46GDhqAxY;p
zn}0&jRgjb&iN|Y9OY6$^nHOmDbqnJIz67U>?J4Shc|x-f-hr-=RB-}JY}(zHatje@
z%y4`YP4Uw52cNJe0CMQ+b>sr4YX^hBnaVCO&%j_G(xUFXghWz139>Ym9eXrTHcL)j
zC24+9J+!#fe_~O=_f|5Nti$6Wb=i{qXi#z)D|`lbx;FuvU*R4>nc&nP>K~Sp2O{{i
zHAB2gIQtPzS>_~HfuirnlInGSM=VvOUD->D8bUKebdr_37fe`KZtH(1B@X!WY0Xo5
zmE6)T*raAT1@2b6J!nj~kQI`8KD8}&Q;hPktWKF*;w6nQetHuVw)n9VUoiffDQl%3
zeu|p(Nx=+oZ~yZ0C)|H+aUugioLC+TRJ7s-Q(fqN?pDv?TN7mL7$QVA2+*a{9yO@4
zS(cnBLTBBKvP3XTg6Vrbv`y$=y<MKrexUaKQ}}EQ^^-J^f3`vMs#2Y_;1@?T=Ez>J
zEQ!c%w0)6o3rU)2XZ%An;J0VdmK=Tn1z{0@TWY|@OcP~oibD?1Bs4NgyolnJI8Zi0
zqqRq?=kLezAnLSN-%T9z_f~Kixm^;{Vu`w!y&{AScdCvF28ZQmH$!+z0LapIwv^x@
z(4m+J2*bMgGeew2kZowfNlXVhAjyjE4I6Y@m;|`>xaeY|C;j>M8v{g1E6X5JPe1{r
zX{rxErz4#fk}~;D7i4dYM(}(l0je$*F+g&&ukyssAXfAuMBO{*LhwEhP;?`f1Y)~s
zznr7bZ8B`aV6pL>3uP7hfj8BP-hH*Xe%{5_#pa;8*+7dxS_xv}oGZW~k3rATYaydi
zoe&jC{<jJHM*z-Q7t~7aO&!V)8^$`usL0;zOQ{M8WMG?qMwPJYYU;3hs592?MMW|;
z8)PeyG(o&>?l5Y}PS=hf2w<0Q<%q}N$+?37-1Nr0?PNI531bkIHvzJH>IS-1So3C+
zD}e4RH&b5aiWc<F9tX1TroBDaf&Q;OK00g!;P8`VJRnEpPufMmFS+*AN{qe}I!k8=
zAo=*BIJX!iDXX_T5=h$YcC^v3(77mQoDl+&(HKeazE0b^Y6PWFR}ifRRk;Bm=^Dc+
z2V<!CMZRuZlM?jR1U+?;#E}F#C`7{K9e1mlco6yYndyp4?mH`@bVAwkPVWmf9NgIE
zm#4~pB9>q~ireBl&#7MvvQMLX1$dISvOfyZ%RvN?&inqf-pZxeXS`*$_0Mw^Kws9u
zTxKBoWBIL(4*8Nl831AVRQ?M8Qsk>3m=a$d^2HDTKr<k2o#~?%dW5l!SOxY%k=^Yb
H;`sjqO>Ay=

literal 0
HcmV?d00001

diff --git a/Assets/world/world1/layers/1/normal.png b/Assets/world/world1/layers/1/normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc2ede6b17d6a7f2b5b0b8ab84643562b4db3b7d
GIT binary patch
literal 4196
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

literal 0
HcmV?d00001

diff --git a/Assets/world/world1/layers/1/texture.png b/Assets/world/world1/layers/1/texture.png
new file mode 100644
index 0000000000000000000000000000000000000000..149273f21cadd69083c0a5dd759a708da706f465
GIT binary patch
literal 4573
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

literal 0
HcmV?d00001

diff --git a/Assets/world/world1/layers/deco/normal.png b/Assets/world/world1/layers/deco/normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0aab9434f4c0caaa4c23c47a3292c4602532406
GIT binary patch
literal 4243
zcmeAS@N?(olHy`uVBq!ia0y~y5CAe68911L)Se6#D<G#e)7d$|)7e>}peR2rGbfdS
zL1SX=L|c!;4l+mMgO_TFvTJvAu&mh?As||KMN4F%(+bh3QiGjeoHH&>ShB-{YaJ`Q
zz1V6#y>q*)c5pR4VDIQ&J$X_0lpp(-T~IpK{J3t<?(aLQ**T^%U0yTI(BX2fv0!)C
z$}e3K6|UB77n&V=PMk4HQ`O`<|FM)`KK{Lu&FSBF<}VID8^QCT^N8^ogWN}@k5>BL
zez3=1CaE$~)lOZ`^kvhL{+RHXy2o=?Z#-b^oMvR`E~6w??7POq@bqk{k1B-`S4&Qb
z2kEVzv)v-QRcQ77$@>jvT%10Ahu>y-L!AUcAr}peL}u0-9T!$jPEvII9mroFe^!5@
zx8ij+3Cm}JEo?iVvHx$re>du8XQ8>K1Zz~h%=2UpjyFtKH$ASAxAyzW^1+@tyy|fL
z8ivdBmrR$A`oZzy7MtEW=~<iDW8N|B^>52LWqQ&-_(WRccjI5nOfJ-Nm#o>f_v-h;
zUkoZMSO4HGDB$3Eu2FsV@!j0Bd;eB1yLX>|+nl09yY^Km0ON(Tz$3Dlfk96hgc&QA
z+Lr+Z*-JcqUD+RVF|wL)eYQ#Q0t!i%xJHyX=jZ08=9Mrw7o{eaq^2m8XO?6rxO@5r
zgg5euGcfSgc)B=-RNQ)d+mV++LEwOa!%s_gX`M{fH~Vdif%0(hVY@OToWsEI=R6Vz
zm`K==xf}+_JckBkjSNgY$dUpH$h-yyW@Ijl1Ts(I05WgXN`}#ZWf)C945OK3v?v%Y
z3V;ol1mx;rv?gH~tuGly8zQ64Er!veV6-S;7%d7I23=9mz@DSQ{6Ew^>;<Ui_H^}g
JS?83{1OV17LrDMt

literal 0
HcmV?d00001

diff --git a/Assets/world/world1/layers/deco/texture.png b/Assets/world/world1/layers/deco/texture.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce37a03b88a100db76849f2257419730122f5c90
GIT binary patch
literal 7285
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

literal 0
HcmV?d00001

diff --git a/Makefile b/Makefile
index dcbac2b..e586110 100644
--- a/Makefile
+++ b/Makefile
@@ -83,4 +83,3 @@ $(OUTDIR)/%.$(OBJEXT): $(SRCDIR)/%.$(SRCEXT)
 	@rm -f $(OUTDIR)/$*.$(DEPEXT).tmp
 
 .PHONY: all remake clean cleaner resources
-
diff --git a/Scripts/world.lua b/Scripts/world.lua
index 3b56d9a..40d7218 100644
--- a/Scripts/world.lua
+++ b/Scripts/world.lua
@@ -7,7 +7,6 @@ world = {
     Register = function(self)
 
         -- TODO make world have global textures to speed up rendering
-
         self:registerMaterial("grass", {
             -- TODO combine both of these into 1
             texture = {
@@ -110,3 +109,25 @@ world = {
 
 --world:Generate()
 game.worldRegister(world)
+
+newWorld = {
+    Register = function(self)
+        self.unitSize = 8;
+        self:createLayer(0, {
+            texture = { file = "Assets/world/world1/layers/0/texture.png" },
+            normal = { file = "Assets/world/world1/layers/0/normal.png" },
+            hitbox = { file = "Assets/world/world1/layers/0/hitbox.png" }
+        });
+        self:createLayer(1, {
+            texture = { file = "Assets/world/world1/layers/1/texture.png" },
+            normal = { file = "Assets/world/world1/layers/1/normal.png" },
+            hitbox = { file = "Assets/world/world1/layers/1/hitbox.png" }
+        });
+        self:createDecoLayer(10, {
+            texture = { file = "Assets/world/world1/layers/deco/texture.png" },
+            normal = { file = "Assets/world/world1/layers/deco/normal.png" },
+        });
+    end,
+    Generate = function(self) end
+}
+game.worldRegister(newWorld);
diff --git a/src/script.cpp b/src/script.cpp
index 6cda627..629baa9 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -134,7 +134,12 @@ void ScriptSystem::scriptExport(void)
             "setData", &World::setData,
             "registerMaterial", &World::registerMaterial,
             "setSize", &World::setSize,
-            "getSize", &World::getSize);
+            "getSize", &World::getSize,
+
+            // New stuff
+            "unitSize", sol::property(&World::setUnitSize, &World::getUnitSize),
+            "createLayer", &World::registerLayer,
+            "createDecoLayer", &World::registerDecoLayer);
 
     game = lua["game"].get_or_create<sol::table>();
     game.set_function("spawn", entitySpawn);
diff --git a/src/world.cpp b/src/world.cpp
index cd89a22..8cfd906 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -134,6 +134,8 @@ World::getSize()
 void World::generateMesh()
 {
     //const unsigned int voxelLength = 6; // 2 triangles @ 3 points each
+    if (!data.size())
+        return;
 
     // Preallocate size of vertexes
     mesh = std::basic_string<WorldMeshData>();
@@ -221,6 +223,29 @@ double World::getHeight(double x, double y, double z)
     return Y;
 }
 
+/*********
+*  NEW  *
+*********/
+void World::registerLayer(float z, sol::object obj)
+{
+    if (obj.get_type() == sol::type::table) {
+        sol::table tab = obj;
+        solidLayers.push_back(SolidLayer(z, tab));
+    } else {
+        throw std::string("Layer must receive a table");
+    }
+}
+
+void World::registerDecoLayer(float z, sol::object obj)
+{
+    if (obj.get_type() == sol::type::table) {
+        sol::table tab = obj;
+        drawLayers.push_back(Layer(z, tab));
+    } else {
+        throw std::string("Layer must receive a table");
+    }
+}
+
 
 /******************
 *  WORLD SYSTEM  *
diff --git a/src/world.hpp b/src/world.hpp
index 9314fa6..acdb533 100644
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -57,6 +57,41 @@ struct WorldMaterial
     }
 };
 
+class Layer
+{
+private:
+    Texture texture;
+    Texture normal;
+
+    float drawLayer = 0.0f;
+
+public:
+
+    Layer(float z, sol::table tab) {
+        drawLayer = z;
+        if (tab["texture"] != nullptr) {
+            sol::object t = tab["texture"];
+            texture = Texture(t);
+        }
+        if (tab["normal"] != nullptr) {
+            sol::object n = tab["normal"];
+            normal = Texture(n);
+        }
+    }
+};
+
+class SolidLayer : public Layer
+{
+private:
+    // hitbox something something
+public:
+    SolidLayer(float z, sol::table tab) : Layer(z, tab) {
+        if (tab["hitbox"] != nullptr) {
+            std::cout << "hitbox: " << std::string(tab["hitbox"]) << std::endl;
+        }
+    }
+};
+
 class World
 {
     friend class WorldSystem;
@@ -72,6 +107,11 @@ private:
     std::unordered_map<std::string, int> string_registry;
     std::vector<WorldMaterial> registry;
 
+    // NEW
+    unsigned int unitSize;
+    std::vector<SolidLayer> solidLayers;
+    std::vector<Layer> drawLayers;
+
 protected:
     // RENDER
     std::basic_string<WorldMeshData> mesh;
@@ -115,6 +155,13 @@ public:
 
     /* PHYSICS */
     double getHeight(double x, double y, double z);
+
+    // NEW
+    unsigned int getUnitSize() {return unitSize;}
+    void setUnitSize(unsigned int u) {unitSize = u;}
+
+    void registerLayer(float, sol::object);
+    void registerDecoLayer(float, sol::object);
 };
 
 /**
-- 
2.39.5