place trees on top of ground, and only on top of ground

capnmidnight · Feb 22, 2017 · 19ff15f · 19ff15f
1 parent 779c576
commit 19ff15f
Show file tree

Hide file tree

Showing 9 changed files with 90 additions and 60 deletions.
diff --git a/demos/forest.html b/demos/forest.html
@@ -53,45 +53,45 @@ <h2>Source</h2>
 var env = new Primrose.BrowserEnvironment({
   font: &quot;../shared_assets/fonts/helvetiker_regular.typeface.json&quot;,
   backgroundColor: 0xC9E6EE,
-  groundTexture: &quot;../shared_assets/images/grass.png&quot;,
+  groundModel: &quot;Ground.obj&quot;,
   useFog: true,
   enableShadows: true,
   shadowRadius: 3,
   fullScreenButtonContainer: &quot;#fullScreenButtonContainer&quot;,
   progress: Preloader.thunk
 });
 
-var treeReady = Primrose.Graphics.ModelFactory.loadModel(&quot;tree.obj&quot;);
+var MF = Primrose.Graphics.ModelFactory,
+  treeReady = MF.loadModel(&quot;tree.obj&quot;),
+  waterReady = MF.loadObject(&quot;Water.obj&quot;);
 
 env.addEventListener(&quot;ready&quot;, function() {
-  treeReady.then(function(treeModel) {
-    treeModel.template.castShadow = true;
-    treeModel.template.receiveShadow = true;
-    for(var i = 0; i &lt; 100; ++i) {
-      treeModel.clone()
-        .named(&quot;tree&quot; + i)
-        .addTo(env.scene)
-        .at(
-          Primrose.Random.number(-25, 25),
-          0,
-          Primrose.Random.number(-25, 25))
-        .rot(
-          0,
-          Primrose.Random.number(0, Math.PI),
-          0)
-        .scl(
-          1,
-          Primrose.Random.number(0.7, 1.3),
-          1);
-    }
-    Preloader.hide();
-  });
+  Promise.all([
+    treeReady.then(function(treeFactory) {
+      treeFactory.template.castShadow = true;
+      treeFactory.template.receiveShadow = true;
+      for(var i = 0; i &lt; 100; ++i) {
+        treeFactory.clone()
+          .named(&quot;tree&quot; + i)
+          .addTo(env.scene)
+          .at(
+            Primrose.Random.number(-25, 25),
+            0,
+            Primrose.Random.number(-25, 25))
+          .rot(
+            0,
+            Primrose.Random.number(0, Math.PI),
+            0)
+          .scl(
+            1,
+            Primrose.Random.number(0.7, 1.3),
+            1);
+      }
+    }),
 
-  env.displays[0].enableMotion = true;
-});
-
-env.addEventListener(&quot;motioncontrollerfound&quot;, function(ctrl){
-  env.displays[0].motionDevice = ctrl;
+    waterReady.then(function(waterModel) {
+      waterModel.addTo(env.scene);
+    })]).then(Preloader.hide);
 });
 </pre>
     </main><!-- end main.pug main block -->

diff --git a/demos/forest/Ground.jpg b/demos/forest/Ground.jpg
diff --git a/demos/forest/Ground.mtl b/demos/forest/Ground.mtl
@@ -0,0 +1,13 @@
+# Blender MTL File: 'None'
+# Material Count: 1
+
+newmtl Ground
+Ns 94.117647
+Ka 1.000000 1.000000 1.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.000000 0.000000 0.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 1
+map_Kd GroundMobile.jpg
diff --git a/demos/forest/GroundMobile.jpg b/demos/forest/GroundMobile.jpg
diff --git a/demos/forest/Tree Bake Tex.png b/demos/forest/Tree Bake Tex.png
diff --git a/demos/forest/Water.jpg b/demos/forest/Water.jpg
diff --git a/demos/forest/Water.mtl b/demos/forest/Water.mtl
@@ -0,0 +1,13 @@
+# Blender MTL File: 'Assets Ver B.blend'
+# Material Count: 1
+
+newmtl Water
+Ns 96.078431
+Ka 1.000000 1.000000 1.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd Water.jpg
diff --git a/demos/forest/app.js b/demos/forest/app.js
@@ -1,43 +1,49 @@
 var env = new Primrose.BrowserEnvironment({
   font: "../shared_assets/fonts/helvetiker_regular.typeface.json",
   backgroundColor: 0xC9E6EE,
-  groundTexture: "../shared_assets/images/grass.png",
+  groundModel: "Ground.obj",
   useFog: true,
   enableShadows: true,
   shadowRadius: 3,
   fullScreenButtonContainer: "#fullScreenButtonContainer",
   progress: Preloader.thunk
 });
 
-var treeReady = Primrose.Graphics.ModelFactory.loadModel("tree.obj");
+var MF = Primrose.Graphics.ModelFactory;
 
 env.addEventListener("ready", function() {
-  treeReady.then(function(treeModel) {
-    treeModel.template.castShadow = true;
-    treeModel.template.receiveShadow = true;
-    for(var i = 0; i < 100; ++i) {
-      treeModel.clone()
-        .named("tree" + i)
-        .addTo(env.scene)
-        .at(
-          Primrose.Random.number(-25, 25),
-          0,
-          Primrose.Random.number(-25, 25))
-        .rot(
-          0,
-          Primrose.Random.number(0, Math.PI),
-          0)
-        .scl(
-          1,
-          Primrose.Random.number(0.7, 1.3),
-          1);
-    }
-    Preloader.hide();
-  });
-
-  env.displays[0].enableMotion = true;
-});
+  Promise.all([
+
+    MF.loadObject("Water.obj").then(function(waterModel) {
+      waterModel.addTo(env.scene);
+    }),
+
+    MF.loadModel("tree.obj").then(function(treeFactory) {
+      treeFactory.template.castShadow = true;
+      treeFactory.template.receiveShadow = true;
+      for(var i = 0; i < 100; ++i) {
+
+        var tree = treeFactory.clone()
+          .named("tree" + i)
+          .addTo(env.scene)
+          .rot(
+            0,
+            Primrose.Random.number(0, Math.PI),
+            0)
+          .scl(
+            1,
+            Primrose.Random.number(0.7, 1.3),
+            1);
+
+
+        do {
+          tree.position.set(
+            Primrose.Random.number(-25, 25),
+            0,
+            Primrose.Random.number(-25, 25));
+          tree.position.y = env.ground.getHeightAt(tree.position);
+        } while(tree.position.y === undefined);
 
-env.addEventListener("motioncontrollerfound", function(ctrl){
-  env.displays[0].motionDevice = ctrl;
+      }
+    })]).then(Preloader.hide);
 });
diff --git a/src/Primrose/Controls/Ground.js b/src/Primrose/Controls/Ground.js
@@ -98,7 +98,5 @@ export default class Ground extends Entity {
         return 100 - hit.distance;
       }
     }
-
-    return 0;
   }
 };