fixed error in style.css

removed lines in move_widget that were causing warning messages in center and caollada tests. renamed c3dl.Plane to c3dl.Plain (Minefield, FF4 RC2.2, Chrome and Chromium would not allow the use of Plane)
Seneca-CDOT · Mar 21, 2011 · d6d9b97 · d6d9b97
1 parent 71df9fe
commit d6d9b97
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 18 deletions.
diff --git a/c3dl-dev/tests/center/models/move_widget.dae b/c3dl-dev/tests/center/models/move_widget.dae
@@ -902,10 +902,6 @@
 					<p>573 538 2152 568 538 2153 569 538 2154 570 538 2155</p>
 					<p>573 539 2156 570 539 2157 571 539 2158 572 539 2159</p>
 				</polygons>
-				<lines count="72">
-					<input offset="0" semantic="VERTEX" source="#test_001-Vertex"/>
-					<p>207 231 209 231 211 231 231 210 231 212 214 231 231 213 231 215 217 231 231 216 219 231 231 218 220 231 221 231 222 231 224 231 231 223 226 231 231 225 231 227 229 231 231 228 230 231 208 231 463 440 463 439 442 463 463 441 444 463 463 443 463 445 463 446 448 463 463 447 449 463 450 463 451 463 463 452 454 463 463 453 463 455 457 463 463 456 458 463 459 463 461 463 463 460 463 462 671 695 695 673 695 674 695 675 677 695 695 676 695 678 695 679 695 680 695 681 683 695 695 682 684 695 685 695 686 695 687 695 689 695 695 688 690 695 695 691 695 692 695 693 672 695 695 694</p>
-				</lines>
 			</mesh>
 		</geometry>
 	</library_geometries>
@@ -985,4 +981,4 @@
 		<instance_physics_scene url="#Scene-Physics"/>
 		<instance_visual_scene url="#Scene"/>
 	</scene>
-</COLLADA>
+</COLLADA>
diff --git a/c3dl-dev/tests/collada/models/move_widget.dae b/c3dl-dev/tests/collada/models/move_widget.dae
@@ -902,10 +902,6 @@
 					<p>573 538 2152 568 538 2153 569 538 2154 570 538 2155</p>
 					<p>573 539 2156 570 539 2157 571 539 2158 572 539 2159</p>
 				</polygons>
-				<lines count="72">
-					<input offset="0" semantic="VERTEX" source="#test_001-Vertex"/>
-					<p>207 231 209 231 211 231 231 210 231 212 214 231 231 213 231 215 217 231 231 216 219 231 231 218 220 231 221 231 222 231 224 231 231 223 226 231 231 225 231 227 229 231 231 228 230 231 208 231 463 440 463 439 442 463 463 441 444 463 463 443 463 445 463 446 448 463 463 447 449 463 450 463 451 463 463 452 454 463 463 453 463 455 457 463 463 456 458 463 459 463 461 463 463 460 463 462 671 695 695 673 695 674 695 675 677 695 695 676 695 678 695 679 695 680 695 681 683 695 695 682 684 695 685 695 686 695 687 695 689 695 695 688 690 695 695 691 695 692 695 693 672 695 695 694</p>
-				</lines>
 			</mesh>
 		</geometry>
 	</library_geometries>
@@ -985,4 +981,4 @@
 		<instance_physics_scene url="#Scene-Physics"/>
 		<instance_visual_scene url="#Scene"/>
 	</scene>
-</COLLADA>
+</COLLADA>
diff --git a/c3dl-dev/tests/shapes/shapes.js b/c3dl-dev/tests/shapes/shapes.js
@@ -37,7 +37,7 @@ function planeMain(canvasName){
   scn.init(canvasName);
 
   if (renderer.isReady()) {
-    var plane = new c3dl.Plane(5,5);
+    var plane = new c3dl.Plain(5,5);
     plane.setTexture("testing.jpg");
     var cam = new c3dl.FreeCamera();
     cam.setPosition([0.0, 3, 9]);

diff --git a/c3dl-dev/tests/style.css b/c3dl-dev/tests/style.css
@@ -6,10 +6,6 @@ html, body {
   padding: 0;
 }
 
-table{
-  border: auto;
-}
-
 h1 {
   background: #385C85;
   color: #FFF;

diff --git a/c3dl/shapes/plane.js b/c3dl/shapes/plane.js
@@ -3,7 +3,7 @@
   Licenced under the MIT License (http://www.c3dl.org/index.php/mit-license/)
 */
 
-c3dl.Plane = c3dl.inherit(c3dl.Shape, function (length, width) {
+c3dl.Plain = c3dl.inherit(c3dl.Shape, function (length, width) {
   c3dl._superc(this);
   this.primitiveSets[0] = new c3dl.PrimitiveSet();
   var vertices = new C3DL_FLOAT_ARRAY([-0.5,0,-0.5, -0.5,0,0.5, 0.5,0,-0.5, 0.5,0,0.5, 0.5,0,-0.5, -0.5,0,0.5]);
@@ -16,7 +16,7 @@ c3dl.Plane = c3dl.inherit(c3dl.Shape, function (length, width) {
   }
 });
 
-c3dl.Plane.prototype.init = function (length, width) {
+c3dl.Plain.prototype.init = function (length, width) {
   length = parseFloat(length);
   width = parseFloat(width);
   var curlength = 1;
@@ -46,4 +46,4 @@ c3dl.Plane.prototype.init = function (length, width) {
   this.boundingVolume.set(this.shape.pos,this.shape.getRotateMat(),this.shape.scaleVec);
 }
 
-
+