From 57011c2d4bd1fc0f423b5069460ac2e003653f42 Mon Sep 17 00:00:00 2001
From: Stojce Slavkovski <stojce@me.com>
Date: Thu, 19 Mar 2015 20:55:18 +0100
Subject: [PATCH] get models from S3

---
 examples/example/entities/makeHouses.js | 46 +++++++++++--------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/examples/example/entities/makeHouses.js b/examples/example/entities/makeHouses.js
index 12205db4ce..37bc1d5a8e 100644
--- a/examples/example/entities/makeHouses.js
+++ b/examples/example/entities/makeHouses.js
@@ -20,36 +20,32 @@
 
     var sizeOfTheHouse = {
         x: 10,
-        y: 10,
+        y: 15,
         z: 10
     };
-    /**/
-
-    // 
-    // 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 randomizeModels = false;
+    /**/
+ 
+    var modelUrlPrefix = "http://public.highfidelity.io/load_testing/3-Buildings-2-SanFranciscoHouse-";
+    var modelurlExt = ".fbx";
+    var modelVariations = 100;
+
     var houses = [];
 
     function addHouseAt(position, rotation) {
-        // get random house model
-        //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)];
+        // get house model
+        var modelNumber = randomizeModels ?
+            1 + Math.floor(Math.random() * (modelVariations - 1)) :
+            (houses.length + 1) % modelVariations;
+        
+        if (modelNumber == 0) {
+            modelNumber = modelVariations;
+        }
+        
+        var modelUrl = modelUrlPrefix + (modelNumber + "") + modelurlExt;
+        print("Model ID:" + modelNumber);
+        print("Model URL:" + modelUrl);
         
         var properties = {
             type: "Model",
@@ -158,4 +154,4 @@
     }
 
     Script.scriptEnding.connect(cleanup);
-})();
\ No newline at end of file
+})();