x_ite 4.2.17 → 4.7.7

package/src/lib/nurbs/extras/sample.js

@@ -1,43 +1,14 @@
 
-define (function ()
+define ([
+	"standard/Math/Numbers/Vector3",
+	"standard/Math/Geometry/Triangle3",
+],
+function (Vector3,
+          Triangle3)
 {
 'use strict';
 
-	function normalize (out, a)
-	{
-		var
-			x = a [0],
-			y = a [1],
-			z = a [2];
-
-		var l = Math .sqrt (x * x + y * y + z * z);
-
-		if (l > 0)
-		{
-			out [0] = a [0] / l;
-			out [1] = a [1] / l;
-			out [2] = a [2] / l;
-		}
-
-		return out
-	}
-
-	function cross (out, a, b)
-	{
-	    var
-			ax = a [0], ay = a [1], az = a [2],
-			bx = b [0], by = b [1], bz = b [2];
-	
-		out [0] = ay * bz - az * by
-		out [1] = az * bx - ax * bz
-		out [2] = ax * by - ay * bx
-
-		return out
-	}
-
-	var
-		tmp1 = [ ],
-		tmp2 = [ ];
+	var tmp1 = [ ];
 
 	return function (mesh, surface, opts)
 	{
@@ -45,11 +16,11 @@ define (function ()
 		opts = opts || { };
 
 		var
-			points  = mesh .points  = mesh .points  || [ ],
-			normals = mesh .normals = mesh .normals || [ ],
-			faces   = mesh .faces   = mesh .faces   || [ ];
+			points      = mesh .points = mesh .points || [ ],
+			faces       = mesh .faces  = mesh .faces  || [ ],
+			haveWeights = opts .haveWeights;
 
-		var dimension = surface .dimension;
+		var dimension = surface .dimension - haveWeights;
 
 		if (Array .isArray (opts .resolution))
 		{
@@ -62,8 +33,6 @@ define (function ()
 				resolution = new Array (surface .splineDimension) .fill (res);
 		}
 
-		var generateNormals = dimension === 3 && (opts .generateNormals !== undefined ? opts .generateNormals : true);
-
 		switch (surface .splineDimension)
 		{
 			case 1:
@@ -73,7 +42,6 @@ define (function ()
 					uClosed    = surface .boundary [0] === 'closed',
 					nuBound    = nu + ! uClosed,
 					nbVertices = nuBound * dimension,
-					uDer       = surface .evaluator ([1, 0]),
 					domain     = opts .domain || surface .domain,
 					uDomain    = domain [0],
 					uDistance  = uDomain [1] - uDomain [0];
@@ -86,10 +54,20 @@ define (function ()
 
 					surface .evaluate (tmp1, u);
 
-					for (var d = 0; d < dimension; ++ d)
-						points [ptr + d] = tmp1 [d];
+					if (haveWeights)
+					{
+						var w = tmp1 [dimension];
+
+						for (var d = 0; d < dimension; ++ d)
+							points [ptr + d] = tmp1 [d] / w;
+					}
+					else
+					{
+						for (var d = 0; d < dimension; ++ d)
+							points [ptr + d] = tmp1 [d];
+					}
 				}
-	
+
 				points .length = nbVertices;
 				break;
 			}
@@ -102,20 +80,19 @@ define (function ()
 					vClosed    = surface .boundary [1] === 'closed',
 					nuBound    = nu + ! uClosed,
 					nvBound    = nv + ! vClosed,
-					nbNormals  = nuBound * nvBound * 3,
 					nbVertices = nuBound * nvBound * dimension,
-					uDer       = surface .evaluator ([1, 0]),
-					vDer       = surface .evaluator ([0, 1]),
 					domain     = opts .domain || surface .domain,
 					uDomain    = domain [0],
 					vDomain    = domain [1],
 					uDistance  = uDomain [1] - uDomain [0],
 					vDistance  = vDomain [1] - vDomain [0];
 
+				// Generate points.
+
 				for (var i = 0; i < nuBound; ++ i)
 				{
 					var u = uDomain [0] + uDistance * i / nu;
-	
+
 					for (var j = 0; j < nvBound; ++ j)
 					{
 						var
@@ -123,57 +100,137 @@ define (function ()
 							ptr = (i + nuBound * j) * dimension;
 
 						surface .evaluate (tmp1, u, v);
-	
-						for (var d = 0; d < dimension; ++ d)
-							points [ptr + d] = tmp1 [d];
 
-						if (generateNormals)
+						if (haveWeights)
 						{
-							normalize (tmp1, cross (tmp1,
-								uDer (tmp1, u, v),
-								vDer (tmp2, u, v)
-							));
-		
-							normals [ptr]     = tmp1 [0];
-							normals [ptr + 1] = tmp1 [1];
-							normals [ptr + 2] = tmp1 [2];
+							var w = tmp1 [dimension];
+
+							for (var d = 0; d < dimension; ++ d)
+								points [ptr + d] = tmp1 [d] / w;
+						}
+						else
+						{
+							for (var d = 0; d < dimension; ++ d)
+								points [ptr + d] = tmp1 [d];
 						}
 					}
 				}
-	
-				normals .length = nbNormals;
-				points  .length = nbVertices;
-				
+
+				points .length = nbVertices;
+
+				// Generate faces.
+
+				var
+					uClosed = opts .closed [0],
+					vClosed = opts .closed [1];
+
 				var c = 0;
-	
+
 				for (var i = 0; i < nu; ++ i)
 				{
 		        var
 						i0 = i,
 						i1 = i + 1;
-	
+
 					if (uClosed)
 						i1 = i1 % nu;
-	
+
 	            for (var j = 0; j < nv; ++ j)
 					{
 						var j0 = j;
 						var j1 = j + 1;
-	
+
 						if (vClosed)
 							j1 = j1 % nv;
-						
-						faces [c ++] = i0 + nuBound * j0;
-						faces [c ++] = i1 + nuBound * j0;
-						faces [c ++] = i1 + nuBound * j1;
-						
-						faces [c ++] = i0 + nuBound * j0;
-						faces [c ++] = i1 + nuBound * j1;
-						faces [c ++] = i0 + nuBound * j1;
+
+						// Triangle 1
+
+						faces [c ++] = i0 + nuBound * j0; // 1
+						faces [c ++] = i1 + nuBound * j0; // 2
+						faces [c ++] = i1 + nuBound * j1; // 3
+
+						// Triangle 2
+
+						faces [c ++] = i0 + nuBound * j0; // 1
+						faces [c ++] = i1 + nuBound * j1; // 3
+						faces [c ++] = i0 + nuBound * j1; // 4
 					}
 				}
-		
+
 				faces .length = c;
+
+				/*
+				// Trimming Contours
+
+				if (opts .trimmingContours)
+				{
+					var holes = [ ];
+
+					var trimmingContours = opts .trimmingContours;
+
+					for (var t = 0, iLength = trimmingContours .length; t < iLength; ++ t)
+					{
+						var
+							trimmingContour = trimmingContours [t],
+							hole            = [ ];
+
+						for (var p = 0, pLength = trimmingContour .length; p < pLength; ++ p)
+						{
+							var point = trimmingContour [p];
+
+							surface .evaluate (tmp1, point .x, point .y);
+
+							for (var d = 0; d < dimension; ++ d)
+								points .push (tmp1 [d]);
+
+							var vertex = new Vector3 (tmp1 [0], tmp1 [1], tmp1 [2]);
+
+							vertex .index = c ++;
+
+							hole .push (vertex);
+						}
+
+						holes .push (hole);
+					}
+
+					var
+						curves    = [ ],
+						triangles = [ ],
+						trimmed   = [ ];
+
+					for (var v = 0, fLength = faces .length; v < fLength; v += 3)
+					{
+						curves    .length = 0;
+						triangles .length = 0;
+
+						var
+							index1 = faces [v]     * 3,
+							index2 = faces [v + 1] * 3,
+							index3 = faces [v + 2] * 3;
+
+						var
+							vertex1 = new Vector3 (points [index1], points [index1 + 1], points [index1 + 2]),
+							vertex2 = new Vector3 (points [index2], points [index2 + 1], points [index2 + 2]),
+							vertex3 = new Vector3 (points [index3], points [index3 + 1], points [index3 + 2]);
+
+						vertex1 .index = v;
+						vertex2 .index = v + 1;
+						vertex3 .index = v + 2;
+
+						curves .push ([ vertex1, vertex2, vertex3 ]);
+						curves .push .apply (curves, holes);
+						curves .push (triangles);
+
+						Triangle3 .triangulatePolygon .apply (Triangle3, curves);
+
+						for (var t = 0, tLength = triangles .length; t < tLength; ++ t)
+							trimmed .push (triangles [t] .index);
+					}
+
+					mesh .faces = trimmed;
+				}
+				*/
+
 				break;
 			}
 			default:
@@ -182,4 +239,4 @@ define (function ()
 
 		return mesh;
 	};
-});
+});

package/src/locale/de.po

@@ -15,213 +15,158 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: Browser/Core/BrowserTimings.js:96
 msgid "Less Properties"
 msgstr "Weniger Eigenschaften"
 
-#: Browser/Core/BrowserTimings.js:98
 msgid "More Properties"
 msgstr "Mehr Eigenschaften"
 
-#: Browser/Core/BrowserTimings.js:124
 msgid "Frame rate"
 msgstr "Bildrate"
 
-#: Browser/Core/BrowserTimings.js:124
 msgid "fps"
 msgstr "BpS"
 
-#: Browser/Core/BrowserTimings.js:125
 msgid "Speed"
 msgstr "Geschwindigkeit"
 
-#: Browser/Core/BrowserTimings.js:125
 msgid "m/s"
 msgstr ""
 
-#: Browser/Core/BrowserTimings.js:125
 msgid "km/h"
 msgstr ""
 
-#: Browser/Core/BrowserTimings.js:150
 msgid "Browser"
 msgstr ""
 
-#: Browser/Core/BrowserTimings.js:150 Browser/Core/BrowserTimings.js:151
-#: Browser/Core/BrowserTimings.js:152 Browser/Core/BrowserTimings.js:153
-#: Browser/Core/BrowserTimings.js:154 Browser/Core/BrowserTimings.js:155
-#: Browser/Core/BrowserTimings.js:156
 msgid "ms"
 msgstr ""
 
-#: Browser/Core/BrowserTimings.js:151
-msgid "X3D"
-msgstr ""
+msgid "X3D total"
+msgstr "X3D gesamt"
 
-#: Browser/Core/BrowserTimings.js:152
-msgid "Routing"
-msgstr "Routen"
+msgid "Event Processing"
+msgstr "Ereignisverarbeitung"
 
-#: Browser/Core/BrowserTimings.js:153
-msgid "Picking"
+msgid "Pointer"
 msgstr "Zeigegerät"
 
-#: Browser/Core/BrowserTimings.js:154
 msgid "Camera"
 msgstr "Kamera"
 
-#: Browser/Core/BrowserTimings.js:155
-msgid "Collision"
-msgstr "Kollision"
+msgid "Collision Detection"
+msgstr "Kollisionserkennung"
 
-#: Browser/Core/BrowserTimings.js:156
-msgid "Display"
-msgstr "Anzeige"
+msgid "Rendering"
+msgstr "Rendering"
 
-#: Browser/Core/BrowserTimings.js:157
-msgid "Shapes"
-msgstr "Formen"
+msgid "Number of Shapes"
+msgstr "Anzahl der Formen"
 
-#: Browser/Core/BrowserTimings.js:158
-msgid "Sensors"
-msgstr "Sensoren"
+msgid "Number of Sensors"
+msgstr "Anzahl der Sensoren"
 
-#: Browser/Core/BrowserTimings.js:163 Browser/Core/ContextMenu.js:210
 msgid "Browser Timings"
 msgstr "Zeitberechnung"
 
-#: Browser/Core/ContextMenu.js:19
 msgid "X_ITE Browser"
 msgstr ""
 
-#: Browser/Core/ContextMenu.js:59
 msgid "Viewpoints"
 msgstr "Ansichtspunkte"
 
-#: Browser/Core/ContextMenu.js:87
 msgid "Available Viewers"
 msgstr "Verfügbare Betrachter"
 
-#: Browser/Core/ContextMenu.js:145
 msgid "Straighten Horizon"
 msgstr "Horizont gerade richten"
 
-#: Browser/Core/ContextMenu.js:95 Browser/Core/ContextMenu.js:107
-#: Browser/Core/ContextMenu.js:121 Browser/Core/ContextMenu.js:135
 msgid "Primitive Quality"
 msgstr "Qualität der Grundobjekte"
 
-#: Browser/Core/ContextMenu.js:99 Browser/Core/ContextMenu.js:147
 msgid "High"
 msgstr "Hoch"
 
-#: Browser/Core/ContextMenu.js:107 Browser/Core/ContextMenu.js:155
 msgid "high"
 msgstr "hoch"
 
-#: Browser/Core/ContextMenu.js:113 Browser/Core/ContextMenu.js:161
 msgid "Medium"
 msgstr "Mittel"
 
-#: Browser/Core/ContextMenu.js:121 Browser/Core/ContextMenu.js:169
 msgid "medium"
 msgstr "mittel"
 
-#: Browser/Core/ContextMenu.js:127 Browser/Core/ContextMenu.js:175
 msgid "Low"
 msgstr "Niedrig"
 
-#: Browser/Core/ContextMenu.js:135 Browser/Core/ContextMenu.js:183
 msgid "low"
 msgstr "niedrig"
 
-#: Browser/Core/ContextMenu.js:143 Browser/Core/ContextMenu.js:155
-#: Browser/Core/ContextMenu.js:169 Browser/Core/ContextMenu.js:183
 msgid "Texture Quality"
 msgstr "Textur Qualität"
 
-#: Browser/Core/ContextMenu.js:191
 msgid "Display Rubberband"
 msgstr "Gummiband anzeigen"
 
-#: Browser/Core/ContextMenu.js:202 Browser/Core/ContextMenu.js:204
 msgid "Rubberband"
 msgstr "Gummiband"
 
-#: Browser/Core/ContextMenu.js:202
 msgid "on"
 msgstr "an"
 
-#: Browser/Core/ContextMenu.js:204
 msgid "off"
 msgstr "aus"
 
-#: Browser/Core/ContextMenu.js:225
 msgid "Mute Browser"
 msgstr "Browser stumm schalten"
 
-#: Browser/Core/ContextMenu.js:233
 msgid "Browser muted"
 msgstr "Browser stumm geschalten"
 
-#: Browser/Core/ContextMenu.js:233
 msgid "Browser unmuted"
 msgstr "Browser Ton an"
 
-#: Browser/Core/ContextMenu.js:239
 msgid "Leave Fullscreen"
 msgstr "Vollbild verlassen"
 
-#: Browser/Core/ContextMenu.js:239
 msgid "Fullscreen"
 msgstr "Vollbild"
 
-#: Browser/Core/ContextMenu.js:249
 msgid "About X_ITE"
 msgstr "Über X_ITE"
 
-#: Browser/Core/ContextMenu.js:342
 msgid "Examine Viewer"
 msgstr "Untersuchen"
 
-#: Browser/Core/ContextMenu.js:344
 msgid "Walk Viewer"
 msgstr "Laufen"
 
-#: Browser/Core/ContextMenu.js:346
 msgid "Fly Viewer"
 msgstr "Fliegen"
 
-#: Browser/Core/ContextMenu.js:348
 msgid "Plane Viewer"
 msgstr "Ebenen Betrachter"
 
-#: Browser/Core/ContextMenu.js:350
-#, fuzzy
 msgid "Look At Viewer"
 msgstr "Auf Objekte zielen"
 
-#: Browser/Core/ContextMenu.js:352
 msgid "None Viewer"
 msgstr "Kein Betrachter"
 
-#: Browser/Networking/X3DNetworkingContext.js:101
-#, javascript-format
 msgid "Loading %d file"
 msgstr "Lade %d Datei"
 
-#: Browser/Networking/X3DNetworkingContext.js:101
-#, javascript-format
 msgid "Loading %d files"
 msgstr "Lade %d Dateien"
 
-#: Browser/Networking/X3DNetworkingContext.js:104
 msgid "Loading done"
 msgstr "Fertig mit Laden"
 
-#: Browser/X3DBrowser.js:313
 msgid "Failed loading world."
 msgstr "Laden der Dateien fehlgeschlagen."
 
-#~ msgid "Look At"
-#~ msgstr "Auf Objekte zielen"
+msgid "Show World Info"
+msgstr "World Info anzeigen"
+
+msgid "Viewpoint is copied to clipboard."
+msgstr "Ansichtspunkt wurde in die Zwischenablage kopiert."