Begin wereld

CrystalPoint.vcxproj

@@ -184,7 +184,7 @@
   <ItemGroup>
     <None Include="worlds\fire.json" />
     <None Include="worlds\ice.json" />
-    <None Include="worlds\maze.json" />
+    <None Include="worlds\rock.json" />
     <None Include="worlds\small.json" />
     <None Include="worlds\worlds.json" />
   </ItemGroup>

CrystalPoint.vcxproj.filters

@@ -121,7 +121,7 @@
     <None Include="worlds\small.json">
       <Filter>Source Files\json</Filter>
     </None>
-    <None Include="worlds\maze.json">
+    <None Include="worlds\rock.json">
       <Filter>Source Files\json</Filter>
     </None>
   </ItemGroup>

Enemy.cpp

@@ -18,7 +18,7 @@ Enemy::Enemy(const std::string &fileName,
 	this->canCollide = true;
 	target = position;
 	speed = 1;
-	radius = 10;
+	radius = 20;
 	hasTarget = false;
 }
 

models/Enemies/Bob.mtl

@@ -0,0 +1,113 @@
+newmtl bob1:initialShadingGroup
+illum 4
+Kd 0.50 0.50 0.50
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl initialShadingGroup
+illum 4
+Kd 0.67 0.67 0.67
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert2SG
+illum 4
+Kd 0.20 0.32 0.50
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert5SG
+illum 4
+Kd 1.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert6SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert7SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert8SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert10SG
+illum 4
+Kd 1.00 1.00 1.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert12SG
+illum 4
+Kd 0.58 0.00 1.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert13SG
+illum 4
+Kd 0.00 1.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert14SG
+illum 4
+Kd 1.00 1.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert15SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd TheThing2.png
+Ni 1.00
+newmtl lambert16SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd SkateboardwielThing.png
+Ni 1.00
+newmtl lambert17SG
+illum 4
+Kd 0.25 0.25 0.25
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+Ks 0.50 0.50 0.50
+newmtl lambert18SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd Bobhelemaal2.png
+Ni 1.00
+Ks 0.50 0.50 0.50
+newmtl pasted__lambert2SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl pasted__lambert4SG
+illum 4
+Kd 0.50 1.00 1.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl pasted__lambert5SG
+illum 4
+Kd 0.00 1.00 1.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00

models/Enemies/Monkey.mtl

@@ -0,0 +1,61 @@
+newmtl Engine_Thomas:Eyes
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd Eye_01.png
+Ni 1.00
+Ks 0.37 0.37 0.37
+Ns 96.08
+newmtl Engine_Thomas:Page_01
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd engine_thomas_page1.png
+Ni 1.00
+Ks 0.37 0.37 0.37
+Ns 96.08
+newmtl Engine_Thomas:Page_02
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd engine_thomas_page2.png
+Ni 1.00
+Ks 0.37 0.37 0.37
+Ns 96.08
+newmtl Engine_Thomas:Page_05
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 0.00 0.00 0.00
+map_Kd Engine_Thomas_Page3.png
+Ni 1.00
+Ks 0.37 0.37 0.37
+Ns 96.08
+newmtl Engine_Thomas:Shadow
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 0.00 0.00 0.00
+map_Kd Thomas_Shadow.png
+Ni 1.00
+Ks 0.37 0.37 0.37
+Ns 96.08
+newmtl initialShadingGroup
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd tex_wendy.jpg
+Ni 1.00
+newmtl wooper:wooper
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.20 0.20 0.20
+Tf 1.00 1.00 1.00
+map_Kd wooper.png
+Ni 1.00
+Ks 0.00 0.00 0.00
+Ns 0.00

models/Enemies/Skateboard.mtl

@@ -0,0 +1,113 @@
+newmtl bob1:initialShadingGroup
+illum 4
+Kd 0.50 0.50 0.50
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl initialShadingGroup
+illum 4
+Kd 0.67 0.67 0.67
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert2SG
+illum 4
+Kd 0.20 0.32 0.50
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert5SG
+illum 4
+Kd 1.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert6SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert7SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert8SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert10SG
+illum 4
+Kd 1.00 1.00 1.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert12SG
+illum 4
+Kd 0.58 0.00 1.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert13SG
+illum 4
+Kd 0.00 1.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert14SG
+illum 4
+Kd 1.00 1.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert15SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd TheThing2.png
+Ni 1.00
+newmtl lambert16SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd SkateboardwielThing.png
+Ni 1.00
+newmtl lambert17SG
+illum 4
+Kd 0.25 0.25 0.25
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+Ks 0.50 0.50 0.50
+newmtl lambert18SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd Bobhelemaal2.png
+Ni 1.00
+Ks 0.50 0.50 0.50
+newmtl pasted__lambert2SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl pasted__lambert4SG
+illum 4
+Kd 0.50 1.00 1.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl pasted__lambert5SG
+illum 4
+Kd 0.00 1.00 1.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00

models/Rocks/Cave1.mtl

@@ -1,43 +1,6 @@
-newmtl initialShadingGroup
+newmtl Cave1:pasted__lambert4SG
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-newmtl lambert2SG
-illum 4
-Kd 0.11 0.07 0.00
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-newmtl lambert3SG
-illum 4
-Kd 0.50 0.35 0.00
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-newmtl lambert4SG
 illum 4
 Kd 0.13 0.14 0.16
 Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-newmtl lambert5SG
-illum 4
-Kd 0.00 0.00 0.00
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-map_Kd Naamloos.png
-Ni 1.00
-newmtl pasted__lambert4SG
-illum 4
-Kd 0.13 0.14 0.16
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-newmtl pasted__pasted__lambert3SG1
-illum 4
-Kd 0.45 0.45 0.45
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00

worlds/maze.json

@@ -1,39 +0,0 @@
-{
-  "world": {
-    "heightmap": "worlds/mazeHeightmap.png",
-    "texture": "worlds/mazeStone.png",
-    "scale": 1,
-    "object-templates": [
-      {
-        "color": 190,
-        "file": "models/Rocks/Cave1.obj"
-      },
-      {
-        "color": 200,
-        "file": "models/Rocks/SpikeRock2.obj"
-      },
-      {
-        "color": 210,
-        "file": "models/Rocks/SpikeRock1.obj"
-      },
-      {
-        "color": 220,
-        "file": "models/Rocks/SpikeRock3.obj"
-      },
-      {
-        "color": 230,
-        "file": "models/Rocks/SpikeRock4.obj"
-      },
-      {
-        "color": 240,
-        "file": "models/Rocks/SpikeRock5.obj"
-      }
-
-    ]
-  },
-    "player": {
-      "startposition": [ 300, 40, 450 ]
-    },
-    "objects": [ ],
-    "enemies": [ ]
-}

worlds/rock.json

@@ -0,0 +1,77 @@
+{
+  "world": {
+    "heightmap": "worlds/rockHeightmap.png",
+    "texture": "worlds/rockStone2.png",
+    "scale": 1,
+    "object-templates": [
+      {
+        "color": 190,
+        "file": "models/Rocks/Cave1.obj"
+      },
+      {
+        "color": 200,
+        "file": "models/Rocks/SpikeRock2.obj"
+      },
+      {
+        "color": 210,
+        "file": "models/Rocks/SpikeRock1.obj"
+      },
+      {
+        "color": 220,
+        "file": "models/Rocks/SpikeRock3.obj"
+      },
+      {
+        "color": 230,
+        "file": "models/Rocks/SpikeRock4.obj"
+      },
+      {
+        "color": 240,
+        "file": "models/Rocks/SpikeRock5.obj"
+      }
+
+    ]
+  },
+    "player": {
+      "startposition": [ 300, 40, 450 ]
+    },
+    "objects": [ ],
+  "enemies": [
+    {
+      "file": "models/squid/Blooper.obj",
+      "pos": [ 300, 2, 500 ],
+      "scale": 0.01
+    },
+    {
+      "file": "models/Enemies/Bob.obj",
+      "pos": [ 300, 0, 490 ],
+      "scale": 0.5
+    },
+    {
+      "file": "models/Enemies/Skateboard.obj",
+      "pos": [ 300, 4, 510 ],
+      "scale": 1
+    },
+    {
+      "file": "models/Enemies/Monkey.obj",
+      "pos": [ 60, 0, 675 ],
+      "scale": 2
+    },
+    {
+      "file": "models/Enemies/Vincent.obj",
+      "pos": [ 300, 0, 520 ],
+      "scale": 0.2
+    },
+    {
+      "file": "models/Enemies/Vincent.obj",
+      "pos": [ 300, 0, 521 ],
+      "scale": 0.2
+    },
+    {
+      "file": "models/Enemies/Vincent.obj",
+      "pos": [ 300, 0, 522 ],
+      "scale": 0.2
+    }
+
+
+  ]
+}

worlds/worlds.json

@@ -1,8 +1,9 @@
 {
-	"worlds": [
+  "worlds": [
-			"worlds/small.json",
+    "worlds/rock.json",
-			"worlds/ice.json",
+    "worlds/small.json",
-      "worlds/fire.json",
+    "worlds/ice.json",
-      "worlds/maze.json"
+    "worlds/fire.json"
-	]
+
+  ]
 }