Changeset 29719 for other-projects/nz-flag-design/trunk/render-3d/flag.html

Timestamp:

2015-02-09T09:51:09+13:00 (9 years ago)

Author:

bmt11

Message:

Added Tooltip for slider need to rework so that it doesnt overlay

File:

• other-projects/nz-flag-design/trunk/render-3d/flag.html (modified) (7 diffs)

other-projects/nz-flag-design/trunk/render-3d/flag.html

@@ -180 +180 @@
         <script type="text/javascript">
             var keyboard = new KeyboardState();
-            var clothTextures = [];
+            var clothTexture;
 
             var initial = true;
@@ -227 +227 @@
             // array for holding existing flags
             
-            var flags = ["./images/flag.png", "./images/flag2.png", "./images/canada.png"];
+            var flag = "./images/flag.png";//, "./images/flag2.png", "./images/canada.png"];
             var flagSelector = 0;
             var materials;
@@ -305 +305 @@
                 var session_id = $.cookie('JSESSIONID');
                 if (session_id) {
-                  flags[0] = "images/flag-" + session_id + ".png";
+                  flag = "images/flag-" + session_id + ".png";
                 }
 
                 // load flag textures
-                var i;
-                
-                for(i = 0; i < flags.length; i++){
-                    clothTextures[i] = THREE.ImageUtils.loadTexture( flags[i] );
-                    //clothTextures[i].needsUpdate = true;
-                    clothTextures[i].wrapS = clothTextures[i].wrapT = THREE.ClampToEdgeWrapping;
-                    clothTextures[i].anisotropy = 16;
-                }
+                
+                clothTexture = THREE.ImageUtils.loadTexture( flag );
+                clothTexture.wrapS = clothTexture.wrapT = THREE.ClampToEdgeWrapping;
+                clothTexture.anisotropy = 16;
                 createFlag();
                 
@@ -418 +414 @@
             function createFlag(flagFilename) {
                     if (flagFilename) {
-                    flags[0] = "./images/" + flagFilename;
+                    flag = "./images/" + flagFilename;
                 }
     
@@ -425 +421 @@
                     // create materials
                     materials = [
-                        new THREE.MeshLambertMaterial( {specular: 0x030303, fog: false, emissive: 0x111111, shininess: 10, map: clothTextures[0], side: THREE.DoubleSide } ),
+                        new THREE.MeshLambertMaterial( {specular: 0x030303, fog: false, emissive: 0x111111, shininess: 10, map: clothTexture, side: THREE.DoubleSide } ),
                     ];
                     
@@ -434 +430 @@
                     clothGeometry.computeFaceNormals();
 
-                    uniforms = { texture:  { type: "t", value: 0, texture: clothTextures[0] } };
+                    uniforms = { texture:  { type: "t", value: 0, texture: clothTexture } };
                     vertexShader = document.getElementById( 'vertexShaderDepth' ).textContent;
                     fragmentShader = document.getElementById( 'fragmentShaderDepth' ).textContent;  
@@ -454 +450 @@
                 
                 }else{
-                    clothTextures[flagSelector] = THREE.ImageUtils.loadTexture( flags[flagSelector]+'?'+Date.now() );
-                    object.material.map = clothTextures[flagSelector];
+                    clothTexture = THREE.ImageUtils.loadTexture( flag+'?'+Date.now() );
+                    object.material.map = clothTexture;
                     object.material.needsUpdate = true;
                 }