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

Timestamp:

2014-12-15T13:07:02+13:00 (9 years ago)

Author:

bmt11

Message:

All weather is now functioning including switching back to fine weather. Weather is now also affected by wind force

File:

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

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

@@ -27 +27 @@
                 transition: right 0.5s;
                 background-image: url("./images/slider.png");
-                background-size: 25vw 150vh;
+                background-size: cover;
                 background-position: center;
             }
@@ -67 +67 @@
                 <!--Toggle: 
                 <a onclick="wind = !wind;">Wind</a> |-->
-                <a class="myButton" style="background-image:url('./images/sunButton.jpg')" onclick="fine = !fine;"></a>
+                <a class="myButton" style="background-image:url('./images/sunButton.jpg')" onclick="sunny = !sunny;"></a>
                 <a class="myButton" style="background-image:url('./images/rainButton.jpg')" onclick="raining = !raining;"></a>
                 <a class="myButton" style="background-image:url('./images/snowButton.jpg')" onclick="snowing = !snowing;"></a>
@@ -80 +80 @@
             function openclose(){
                 if (open){
-                    document.getElementById("menuContainer").style.right = "-20vw";
+                    document.getElementById("menuContainer").style.right = "-19vw";
                     document.getElementById("arrow").style.transform = "rotate(360deg)";
                 }else{document.getElementById("menuContainer").style.right = "0vw";
@@ -101 +101 @@
         <script type="text/javascript" src="./weather/rain.js"></script>
         <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/KeyboardState.js"></script>
@@ -161 +162 @@
             /*  Weather variables  */
             var weatherSystem;
+            
             var raining = false;
             var snowing = false;
+            var sunny = false;
+            
             var snowSystem;
             var rainSystem;
+            var sunSystem;
             
             /*  Mouse variables     */
@@ -184 +189 @@
             
             var object, tmpFlag, arrow;
+            
 
             var rotate = false;
@@ -259 +265 @@
                 rainSystem = new rain();
                 snowSystem = new snow();
+                sunSystem = new sun();
                 weatherSystem = new weatherSystem(scene);
             
@@ -285 +292 @@
                 arrow = new THREE.ArrowHelper( new THREE.Vector3( 0, 1, 0 ), new THREE.Vector3( 0, 0, 0 ), 50, 0xff0000 );
                 arrow.position.set( -200, -50, -200 );
+                arrow.setLength( 0 );
+                arrow.setDirection( 0 );
                 //scene.add( arrow );
 
@@ -423 +432 @@
 
                 var time = Date.now();
+                
                 windStrength = Math.cos( time / 7000 ) * 100 + 200;
                 windForce.set( 1000,500,Math.sin( time / 1000 ) ).normalize().multiplyScalar( windStrength );
                 arrow.setLength( windStrength );
                 arrow.setDirection( windForce );
+
                 controls.update();
                 simulate(time);
@@ -468 +479 @@
                 if(raining && weatherSystem.type != rainSystem){
                     snowing = false;
+                    sunny = false;
                     weatherSystem.swap(rainSystem);
                 }else if(snowing && weatherSystem.type != snowSystem){
                     raining = false;
+                    sunny = false;
                     weatherSystem.swap(snowSystem);
+                }else if(sunny && weatherSystem.type != sunSystem){
+                    raining = false;
+                    snowing = false;
+                    weatherSystem.swap(sunSystem);
                 }