Changeset 29686 for other-projects

Timestamp:

2015-01-14T11:50:09+13:00 (9 years ago)

Author:

bmt11

Message:

 

Location:

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

Files:

• Flag_files/ColladaLoader.js (added)
• Flag_files/OrbitControls.js (modified) (2 diffs)
• flag.html (modified) (8 diffs)
• images/Beehive (added)
• images/Beehive/Concrete_Form_4x8.jpg (added)
• images/Beehive/Metal_Corrogated_Shiny.jpg (added)
• images/Beehive/Metal_Steel_Textured_White.jpg (added)
• images/Beehive2 (added)
• images/Beehive2.dae (added)
• images/Beehive2/BH001.jpg (added)
• images/Beehive2/BH003.jpg (added)
• images/Beehive2/BH004.jpg (added)
• images/Beehive2/BH006.jpg (added)
• images/Beehive2/BH008.jpg (added)
• images/Beehive2/BH009.jpg (added)
• images/Beehive2/BH010.jpg (added)
• images/Beehive2/BH012.jpg (added)
• images/Beehive2/Concrete002.jpg (added)
• images/Beehive2/Concrete005.jpg (added)
• images/Beehive2/Concrete006.jpg (added)
• images/Beehive2/Concrete006_0.jpg (added)
• images/Beehive2/Concrete008.jpg (added)
• images/Beehive2/Fence001.png (added)
• images/Beehive2/Pavement001.jpg (added)
• images/flag.png (modified) ( previous)

other-projects/nz-flag-design/trunk/render-3d/Flag_files/OrbitControls.js

@@ -45 +45 @@
 
     // Limits to how far you can dolly in and out
-    this.minDistance = 800;
-    this.maxDistance = 4500;
+    this.minDistance = 1000;
+    this.maxDistance = 9000;
 
     // Set to true to disable this control
@@ -62 +62 @@
     // How far you can orbit vertically, upper and lower limits.
     // Range is 0 to Math.PI radians.
-    this.minPolarAngle = Math.PI/4; // radians
+    this.minPolarAngle = Math.PI/12; // radians
     this.maxPolarAngle = Math.PI/2; // radians
 

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

@@ -102 +102 @@
         <script type="text/javascript" src="./weather/snow.js"></script>
         <script type="text/javascript" src="./weather/sun.js"></script>
+        <script type="text/javascript" src="./Flag_files/ColladaLoader.js"></script>
         
         <script type="text/javascript" src="./Flag_files/KeyboardState.js"></script>
@@ -209 +210 @@
                 container = document.createElement( 'div' );
                 document.body.appendChild( container );
-                
-                
+                    
                 
                 // scene
@@ -216 +216 @@
                 scene = new THREE.Scene();
 
-                scene.fog = new THREE.Fog( 0x404040, 500, 10000 );
+                scene.fog = new THREE.Fog( 0x404040, 1000, 14000 );
                 scene.fog.color.setHSL( 0.1, 0.1, 0.8 );
 
@@ -222 +222 @@
 
                 camera = new THREE.PerspectiveCamera( 20, window.innerWidth / window.innerHeight, 1, 10000 );
-                camera.position.y = 50;
-                camera.position.z = 1500;
+                camera.position.y = 1500;
+                camera.position.z = 2500;
+                camera.position.x = 2500;
                 scene.add( camera );
                 controls = new THREE.OrbitControls( camera );
@@ -323 +324 @@
 
                 var mesh = new THREE.Mesh( poleGeo, poleMat );
-                mesh.position.y = -25; //-250
-                mesh.position.x = 0;
+                mesh.position.y = 1650; //-250
+                mesh.position.x = -305;
+                mesh.position.z = -165;
                 mesh.receiveShadow = true;
                 mesh.castShadow = false;
                 scene.add( mesh );
 
-
-                var gg = new THREE.BoxGeometry( 10, 10, 10 );
+                /*var tmp = mesh.position
+                var gg = new THREE.BoxGeometry( 100, 100, 100 );
                 var mesh = new THREE.Mesh( gg, poleMat );
-                mesh.position.y = -250;
-                mesh.position.x = 0; //125
+                mesh.position.y = tmp.y - 740;
+                mesh.position.x = tmp.x; //125
+                mesh.position.z = tmp.z;
                 mesh.receiveShadow = true;
                 mesh.castShadow = false;
-                scene.add( mesh );
+                scene.add( mesh );*/
 
 
@@ -366 +369 @@
 
                 window.addEventListener( 'resize', onWindowResize, false );
-
+                
+                
+                var loader = new THREE.ColladaLoader();
+                loader.load('./images/Beehive2.dae', function (result) {
+                  var beehive = result.scene;
+                 // var tex       = beehive[ 0 ];
+                  
+                 //beehive.material.needsUpdate = true; 
+                 // beehive.material.transparent = true; 
+                  //beehive.material.opacity = 0.5;
+                  //console.log(beehive);
+                  /*for( var i = 0; i < beehive.children[0].children.length; i++){
+                    //beehive.children[0].children[i].material.side = THREE.DoubleSide;
+                  }*/
+                
+                  
+                  beehive.position.set(-300,-250,-300);
+                  beehive.scale.set(1,1,1);
+                  beehive.rotation.set(1.5*Math.PI,0,0);
+                  scene.add(beehive);
+                });
             }
             
@@ -401 +424 @@
                     object.material.transparent = true;
                     object.material.opacity = 0.85;
+                    object.position.y = 1800; 
+                    object.position.x = -305;
+                    object.position.z = -165;
                     scene.add( object );
                     initial = false;
@@ -495 +521 @@
                 }
                 
-                camera.lookAt( new THREE.Vector3(scene.position.x+150, scene.position.y+150, scene.position.z) );
+                camera.lookAt( new THREE.Vector3(scene.position.x+150, scene.position.y+1500, scene.position.z) );
 
                 renderer.render( scene, camera );