From 00f1d96af5060180a375a8cbf7b9deb35cbeeb79 Mon Sep 17 00:00:00 2001
From: Stojce Slavkovski <stojce@me.com>
Date: Wed, 18 Mar 2015 19:30:08 +0100
Subject: [PATCH] Use existing house models

---
 examples/example/entities/makeHouses.js | 33 ++++++++++++++++++-------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/examples/example/entities/makeHouses.js b/examples/example/entities/makeHouses.js
index 26224fd58a..12205db4ce 100644
--- a/examples/example/entities/makeHouses.js
+++ b/examples/example/entities/makeHouses.js
@@ -25,23 +25,38 @@
     };
     /**/
 
-    var modelUrl = "http://localhost/~stojce/models/3-Buildings-2-SanFranciscoHouse-";
-    var modelurlExt = ".fbx";
-    var modelVariations = 90;
+    // 
+    // var modelUrl = "http://localhost/~stojce/models/3-Buildings-2-SanFranciscoHouse-";
+    // var modelurlExt = ".fbx";
+    // var modelVariations = 100;
+    
+    var houseModels = [
+        "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseBlue.fbx",
+        "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseBlue3.fbx",
+        "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseGreen.fbx",
+        "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseGreen2.fbx",
+        "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseRed.fbx",
+        "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseRose.fbx",
+        "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseViolet.fbx",
+        "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseYellow.fbx",
+        "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseYellow2.fbx"
+    ];
+        
     var houses = [];
 
     function addHouseAt(position, rotation) {
         // get random house model
-        var modelNumber = 1 + Math.floor(Math.random() * (modelVariations - 1));
-        var modUrl = modelUrl + modelNumber + modelurlExt;
-        print("Model ID:" + modelNumber);
-
+        //var modelNumber = 1 + Math.floor(Math.random() * (modelVariations - 1));
+        //var modelUrl = modelUrl + modelNumber + modelurlExt;
+        //print("Model ID:" + modelNumber);
+        var modelUrl = houseModels[Math.floor(Math.random() * houseModels.length)];
+        
         var properties = {
             type: "Model",
             position: position,
             rotation: rotation,
             dimensions: sizeOfTheHouse,
-            modelURL: modUrl
+            modelURL: modelUrl
         };
 
         return Entities.addEntity(properties);
@@ -77,7 +92,7 @@
                 z: dd
             };
 
-            print("House nr.:" + houses.length + 1);
+            print("House nr.:" + (houses.length + 1));
             houses.push(
                 addHouseAt(Vec3.sum(housePos, posShift), (j % 2 == 0) ? rotEven : rotOdd)
             );