|
From: <ma...@us...> - 2011-12-09 16:48:39
|
Revision: 559
http://openautomation.svn.sourceforge.net/openautomation/?rev=559&view=rev
Author: mayerch
Date: 2011-12-09 16:48:33 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
Make opacity and color selector work (again)
Modified Paths:
--------------
JSFloorPlan/trunk/index.html
JSFloorPlan/trunk/jsfloorplan.js
Modified: JSFloorPlan/trunk/index.html
===================================================================
--- JSFloorPlan/trunk/index.html 2011-12-09 15:37:02 UTC (rev 558)
+++ JSFloorPlan/trunk/index.html 2011-12-09 16:48:33 UTC (rev 559)
@@ -88,17 +88,17 @@
<option value="0.2">0.2</option>
<option value="0.3">0.3</option>
<option value="0.4">0.4</option>
-<option value="0.5" selected="selected">0.5 - halb transparent</option>
+<option value="0.5">0.5 - halb transparent</option>
<option value="0.6">0.6</option>
<option value="0.7">0.7</option>
<option value="0.8">0.8</option>
<option value="0.9">0.9</option>
-<option value="1.0">1.0 - undurchsichtig</option>
+<option value="1.0" selected="selected">1.0 - undurchsichtig</option>
</select>
</td><td>
Farbe: <select size="1" name="fillColor">
-<option value="black" selected="selected">Schwarz</option>
-<option value="grey">Grau</option>
+<option value="black">Schwarz</option>
+<option value="grey" selected="selected">Grau</option>
<option value="white">Weiß</option>
<option value="blue">Blau</option>
<option value="red">Rot</option>
Modified: JSFloorPlan/trunk/jsfloorplan.js
===================================================================
--- JSFloorPlan/trunk/jsfloorplan.js 2011-12-09 15:37:02 UTC (rev 558)
+++ JSFloorPlan/trunk/jsfloorplan.js 2011-12-09 16:48:33 UTC (rev 559)
@@ -890,6 +890,7 @@
{
if( noSetup ) setup3D();
+ // set up camera
var cx = -Math.cos(rotation) * Math.cos(tilt);
var cy = Math.sin(rotation) * Math.cos(tilt);
var cz = Math.sin(tilt);
@@ -897,5 +898,33 @@
camera.position = new THREE.Vector3( cx*dist + buildingProperties.x_center, cy*dist + buildingProperties.y_center, dist * cz );
camera.lookAt( new THREE.Vector3( buildingProperties.x_center, buildingProperties.y_center, 0) );
pointLight.position = camera.position;
+
+ // update opacity
+ cubeMaterial.opacity = showStates.fillOpacity;
+
+ // update color
+ switch( showStates.fillColor )
+ {
+ case 'black':
+ cubeMaterial.color.setRGB( 0.1, 0.1, 0.1 );
+ break;
+ case 'grey':
+ cubeMaterial.color.setRGB( 0.5, 0.5, 0.5 );
+ break;
+ case 'white':
+ cubeMaterial.color.setRGB( 1.0, 1.0, 1.0 );
+ break;
+ case 'blue':
+ cubeMaterial.color.setRGB( 0.0, 0.0, 0.8 );
+ break;
+ case 'red':
+ cubeMaterial.color.setRGB( 0.8, 0.0, 0.0 );
+ break;
+ case 'green':
+ cubeMaterial.color.setRGB( 0.0, 0.8, 0.0 );
+ break;
+ };
+
+
render();
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|