Updated MDL resource, added normal and parallax map for grass and fix…

…ed crash bug

res/runtime/resources.data

@@ -26,6 +26,7 @@ stone.name: Copyrighted Stone Texture
 normalmaps: %[
 - default_normalmap
 - bricks_normalmap
+- grass_normalmap
 - lava_normalmap
 - metal_normalmap
 - sand_normalmap
@@ -35,6 +36,8 @@ default_normalmap.path: ../../../res/runtime/normalmaps/default_normalmap.jpg
 default_normalmap.name: Default Normalmap
 bricks_normalmap.path: ../../../res/runtime/normalmaps/bricks_normalmap.jpg
 bricks_normalmap.name: Bricks Normalmap
+grass_normalmap.path: ../../../res/runtime/normalmaps/grass_normalmap.png
+grass_normalmap.name: Grass Normalmap
 lava_normalmap.path: ../../../res/runtime/normalmaps/lava_normalmap.jpg
 lava_normalmap.name: Lava Normalmap
 metal_normalmap.path: ../../../res/runtime/normalmaps/metal_normalmap.jpg
@@ -48,6 +51,7 @@ stone_normalmap.name: Stone Normalmap
 parallaxmaps: %[
 - default_parallaxmap
 - bricks_parallaxmap
+- grass_parallaxmap
 - lava_parallaxmap
 - metal_parallaxmap
 - sand_parallaxmap
@@ -57,6 +61,8 @@ default_parallaxmap.path: ../../../res/runtime/parallaxmaps/default_parallax.png
 default_parallaxmap.name: Default Parallaxmap
 bricks_parallaxmap.path: ../../../res/runtime/parallaxmaps/bricks_parallax.jpg
 bricks_parallaxmap.name: Bricks Parallaxmap
+grass_parallaxmap.path: ../../../res/runtime/parallaxmaps/grass_parallax.png
+grass_parallaxmap.name: Grass Parallaxmap
 lava_parallaxmap.path: ../../../res/runtime/parallaxmaps/lava_parallax.jpg
 lava_parallaxmap.name: Lava Parallaxmap
 metal_parallaxmap.path: ../../../res/runtime/parallaxmaps/metal_parallax.jpg
@@ -85,5 +91,5 @@ torus.path: ../../../res/runtime/models/torus.obj
 torus.name: Complete Torus
 cylinder.path: ../../../res/runtime/models/cylinder.obj
 cylinder.name: Complete Cylinder
-speed: 0.5
-played: 125253
+speed: 4.5
+played: 125000

res/runtime/worlds/hightail.world

@@ -0,0 +1,21 @@
+gravity: [0, 0, 0]
+spawnpoint: [0, 0, 0]
+spawnorientation: [0, 0, 0]
+object0.mesh: cube
+object0.texture: stone
+object0.normalmap: stone_normalmap
+object0.parallaxmap: stone_parallaxmap
+object0.pos: [0, -108, 0]
+object0.rot: [0, 0, 0]
+object0.scale: [800, 100, 800]
+object1.mesh: cube
+object1.texture: wood
+object1.normalmap: wood_normalmap
+object1.parallaxmap: wood_parallaxmap
+object1.pos: [-1395.5, 0, 0]
+object1.rot: [0, 0, 0]
+object1.scale: [600, 40, 600]
+objects: %[
+- object0
+- object1]%
+entityobjects: %[

res/runtime/worlds/random.world

@@ -50,12 +50,68 @@ object6.parallaxmap: lava_parallaxmap
 object6.pos: [-465.339, 0, -611.085]
 object6.rot: [0, 0.045, 0]
 object6.scale: [100, 100, 100]
+object7.mesh: cube
+object7.texture: lava
+object7.normalmap: bricks_normalmap
+object7.parallaxmap: bricks_parallaxmap
+object7.pos: [-437, 328, -855]
+object7.rot: [0, 0, 0]
+object7.scale: [100, 100, 100]
+object8.mesh: cube
+object8.texture: metal
+object8.normalmap: metal_normalmap
+object8.parallaxmap: metal_parallaxmap
+object8.pos: [339.5, 183, -687.5]
+object8.rot: [0, 0, 0]
+object8.scale: [80, 80, 80]
+object9.mesh: cube
+object9.texture: grass
+object9.normalmap: lava_normalmap
+object9.parallaxmap: lava_parallaxmap
+object9.pos: [349, 443.5, -718]
+object9.rot: [0, 0, 0]
+object9.scale: [80, 80, 80]
+object10.mesh: monkeyhead
+object10.texture: sand
+object10.normalmap: sand_normalmap
+object10.parallaxmap: sand_parallaxmap
+object10.pos: [336, 312, -705.5]
+object10.rot: [0.04, 3.12252, 0]
+object10.scale: [70, 70, 70]
+object11.mesh: cube
+object11.texture: stone
+object11.normalmap: lava_normalmap
+object11.parallaxmap: lava_parallaxmap
+object11.pos: [746.892, 214, -117.081]
+object11.rot: [0, -1.59, 0]
+object11.scale: [100, 100, 100]
+object12.mesh: cube
+object12.texture: grass
+object12.normalmap: bricks_normalmap
+object12.parallaxmap: bricks_parallaxmap
+object12.pos: [739, 229, 165.5]
+object12.rot: [0, 0, 0]
+object12.scale: [100, 100, 100]
+object13.mesh: cylinder
+object13.texture: lava
+object13.normalmap: lava_normalmap
+object13.parallaxmap: lava_parallaxmap
+object13.pos: [0, -111.5, 0]
+object13.rot: [0, 0, 0]
+object13.scale: [50, 50, 50]
 objects: %[
 - object0
 - object1
 - object2
 - object3
 - object4
 - object5
-- object6]%
+- object6
+- object7
+- object8
+- object9
+- object10
+- object11
+- object12
+- object13]%
 entityobjects: %[

src/test.cpp

@@ -109,7 +109,10 @@ int main()
 	}
 	std::ostringstream strum;
 	strum << secondsLifetime;
+	std::cout << "Deleting tag...\n";
 	timeStorage.deleteTag("played");
+	std::cout << "Re-adding tag...\n";
 	timeStorage.addTag("played", strum.str());
+	std::cout << "Exit.\n";
 	return 0;
 }