Changeset 188 for js/viewer-f0/js/graphicsEngine.js

Timestamp:

03/23/14 12:52:58 (10 years ago)

Author:

mmichalski

Message:

Examples how to open creatues by viewer

File:

• js/viewer-f0/js/graphicsEngine.js (modified) (12 diffs)

js/viewer-f0/js/graphicsEngine.js

@@ -1 @@
-function GraphicsEngine() {
+function GraphicsEngine(context) {
     this._scene = undefined;
     this._camera = undefined;
     this._renderer = undefined;
-    this._canvasWidth = 500;
-    this._canvasHeight = 500;
-    this._containerContext = undefined;
+    this._canvasWidth = 400;
+    this._canvasHeight = 400;
+    this._containerContext = context;
     this._BALL_RADIUS = 0.25;
     this._controls = undefined;
@@ -21 +21 @@
     this._renderer.setClearColor(0x000000, 1);
     this._renderer.setSize(this._canvasWidth, this._canvasHeight);
-    this._containerContext = $("#container");
+    //this._containerContext = $("#container");
     this._containerContext.append(this._renderer.domElement);
 }
@@ -43 +43 @@
 GraphicsEngine.prototype._rotateObject = function (object, part) {
     object.rotateX(part.getXrot());
-    object.rotateY(part.getYrot());
+    object.rotateY(-part.getYrot());
     object.rotateZ(part.getZrot());
 }
@@ -74 +74 @@
 }
 
+GraphicsEngine.prototype._debugShow = function(object)
+{
+    var pos = object.position;
+    var scale = object.scale;
+    var rot = object.rotation
+    //console.log(pos.x, pos.y, pos.z , "|", rot.x, rot.y, rot.z,"|", scale.x, scale.y, scale.z);
+}
+
 GraphicsEngine.prototype._addEllipsoid = function (part) {
     var geometry = new THREE.SphereGeometry(1, 20, 20);
-    geometry.applyMatrix(new THREE.Matrix4().makeScale(part.getXshape(), part.getYshape(), part.getZshape()));
-
     var ellipsoidMaterial = new THREE.MeshPhongMaterial({color: 0xffffff});
     ellipsoidMaterial.color.setRGB(part.getR(), part.getG(), part.getB())
 
     var ellipsoid = new THREE.Mesh(geometry, ellipsoidMaterial);
+    ellipsoid.scale.set(part.getXshape(), part.getYshape(), part.getZshape())
     ellipsoid.position.set(part.getX(), part.getY(), part.getZ());
     this._rotateObject(ellipsoid, part);
@@ -88 +95 @@
     if(this._showAxis)
         ellipsoid.add(new THREE.AxisHelper(1));
+
     this._scene.add(ellipsoid);
 }
@@ -93 +101 @@
 GraphicsEngine.prototype._addCylinder = function (part) {
     var geometry = new THREE.CylinderGeometry(1, 1, 1, 10, 10, false);
-    geometry.applyMatrix(new THREE.Matrix4().makeScale(part.getZshape(), part.getXshape(), part.getYshape()));
 
     var material = new THREE.MeshLambertMaterial({color: 0xffffff});
@@ -99 +106 @@
 
     var cylinder = new THREE.Mesh(geometry, material);
+
+    cylinder.scale.set(part.getXshape(), part.getYshape(), part.getZshape())
     cylinder.position.set(part.getX(), part.getY(), part.getZ());
-    cylinder.overdraw = true;
     this._rotateObject(cylinder, part);
 
     this._parts.push(cylinder);
     if(this._showAxis)
-        cylinder.add(new THREE.AxisHelper(1));
+        cylinder.add(new THREE.AxisHelper(5));
+
     this._scene.add(cylinder);
+
 }
 
 GraphicsEngine.prototype._addCuboid = function (part) {
     var geometry = new THREE.CubeGeometry(2, 2, 2, 10, 10, 10);
-    geometry.applyMatrix(new THREE.Matrix4().makeScale(part.getXshape(), part.getYshape(), part.getZshape()));
+    //TODO: poprawić getXshape na getXscale
 
     var material = new THREE.MeshLambertMaterial({color: 0xffffff});
@@ -117 +127 @@
 
     var cube = new THREE.Mesh(geometry, material);
+    cube.scale.set(part.getXshape(), part.getYshape(), part.getZshape())
     cube.position.set(part.getX(), part.getY(), part.getZ());
     this._rotateObject(cube, part);
@@ -127 +138 @@
 
 GraphicsEngine.prototype.addPart = function (part) {
+    console.log(part.getX(),part.getY(),part.getZ(), "|", part.getXshape(),part.getYshape(),part.getZshape(),"|",part.getXrot(),part.getYrot(),part.getZrot())
     switch (part.getType()) {
         case 0:
@@ -196 +208 @@
 
         copy.rotateX(joint.getXrot());
-        copy.rotateY(joint.getYrot());
+        copy.rotateY(-joint.getYrot());
         copy.rotateZ(joint.getZrot());
 
@@ -233 +245 @@
     this._controls = new THREE.TrackballControls(this._camera, this._renderer.domElement)
     this._debug();
+
+
+
 }
 
@@ -255 +270 @@
 GraphicsEngine.prototype.debugTest = function()
 {
-
-}
-
+    for(var i = 0; i < this._parts.length; i++)
+        this._debugShow(this._parts[i]);
+}
+