Merge branch 'development'

Author: kovacsv

build/jsmodeler.ext.svgtomodel.js

@@ -46,7 +46,7 @@
 				current = scene.children[i];
 				if (current instanceof THREE.Mesh ||
 					current instanceof THREE.Line ||
-					current instanceof THREE.PointCloud)
+					current instanceof THREE.Points)
 				{
 					scene.remove (current);
 					i--;
@@ -124,13 +124,13 @@
 				}
 			}
 
-			var material = new THREE.PointCloudMaterial ({
+			var material = new THREE.PointsMaterial ({
 				size: 0.05,
 				color : 0x000000,
 				depthTest: false
 			});
 
-			var particle = new THREE.PointCloud (bezierData.controlPointGeometry, material);
+			var particle = new THREE.Points (bezierData.controlPointGeometry, material);
 			bezierData.controlPointScene.add (particle);
 		}
 
@@ -143,16 +143,7 @@
 
 			bezierData.surfaceBody = JSM.GenerateBezierSurface (scp, 32, 32, true);
 			bezierData.surfaceBody.SetPolygonsMaterialIndex (0);
-			
-			bezierData.surfaceBody.SetTextureProjectionType ('Planar');
-			bezierData.surfaceBody.SetTextureProjectionCoords (new JSM.CoordSystem (
-				new JSM.Coord (0.0, 0.0, 0.0),
-				new JSM.Coord (1.0, 0.0, 0.0),
-				new JSM.Coord (0.0, 1.0, 0.0),
-				new JSM.Coord (0.0, 0.0, 0.0)
-			));			
-						
-			bezierData.surfaceBody.SetPlanarTextureProjection (new JSM.Coord (0.0, 0.0, 0.0), new JSM.Coord (1.0, 0.0, 0.0), new JSM.Coord (0.0, 0.0, -1.0));
+			bezierData.surfaceBody.SetPlanarTextureProjection (new JSM.Coord (0.0, 0.0, 0.0), new JSM.Coord (1.0, 0.0, 0.0), new JSM.Coord (0.0, 1.0, 0.0));
 
 			//JSM.GenerateRandomMaterials (bezierData.surfaceBody, materials, true);
 			var meshes = JSM.ConvertBodyToThreeMeshes (bezierData.surfaceBody, materials);

build/jsmodeler.ext.three.js

@@ -173,7 +173,7 @@
 
 				var i, j, k;
 				var body, transformation;
-				for (k = ticTacToe.zSize - 1; k >= 0; k--) {
+				for (k = 0; k < ticTacToe.zSize; k++) {
 					for (j = 0; j < ticTacToe.ySize; j++) {
 						for (i = 0; i < ticTacToe.xSize; i++) {
 							body = JSM.GenerateCircle (ticTacToe.shapeSize / 2.0, 20);