aboutsummaryrefslogtreecommitdiff
path: root/js/lib/geom
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-06 12:13:59 -0700
committerPushkar Joshi2012-04-06 12:13:59 -0700
commit6cce5e9367676f5b452c28dd7d960aa46f4e464c (patch)
tree779125b7c1fc668c02e0dfbb661494a16242c329 /js/lib/geom
parentf61545fd7054088efc88aafffd78e11df80d750d (diff)
parent7656b6eac7aec59697c6cddbe2a507fe9e4aa187 (diff)
downloadninja-6cce5e9367676f5b452c28dd7d960aa46f4e464c.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/lib/geom')
-rwxr-xr-xjs/lib/geom/brush-stroke.js12
-rwxr-xr-xjs/lib/geom/circle.js102
-rwxr-xr-xjs/lib/geom/geom-obj.js442
-rwxr-xr-xjs/lib/geom/line.js74
-rwxr-xr-xjs/lib/geom/rectangle.js118
-rw-r--r--js/lib/geom/shape-primitive.js4
6 files changed, 192 insertions, 560 deletions
diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js
index 2a751a89..8c5ffef3 100755
--- a/js/lib/geom/brush-stroke.js
+++ b/js/lib/geom/brush-stroke.js
@@ -715,18 +715,6 @@ var BrushStroke = function GLBrushStroke() {
715 this.update(); //after this, the stroke is ready to be rendered 715 this.update(); //after this, the stroke is ready to be rendered
716 }; 716 };
717 717
718
719 this.export = function() {
720 var jsonObject = this.exportJSON();
721 var stringified = JSON.stringify(jsonObject);
722 return "type: " + this.geomType() + "\n" + stringified;
723 };
724
725 this.import = function( importStr ) {
726 var jsonObject = JSON.parse(importStr);
727 this.importJSON(jsonObject);
728 }
729
730 this.collidesWithPoint = function (x, y, z) { 718 this.collidesWithPoint = function (x, y, z) {
731 if (x < this._BBoxMin[0]) return false; 719 if (x < this._BBoxMin[0]) return false;
732 if (x > this._BBoxMax[0]) return false; 720 if (x > this._BBoxMax[0]) return false;
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index d48bf98b..7fa78b12 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -61,8 +61,6 @@ var Circle = function GLCircle() {
61 } else { 61 } else {
62 this._fillMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ); 62 this._fillMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() );
63 } 63 }
64
65 this.exportMaterials();
66 }; 64 };
67 65
68 /////////////////////////////////////////////////////////////////////// 66 ///////////////////////////////////////////////////////////////////////
@@ -178,7 +176,7 @@ var Circle = function GLCircle() {
178 if (!world._useWebGL) return; 176 if (!world._useWebGL) return;
179 177
180 // make sure RDGE has the correct context 178 // make sure RDGE has the correct context
181 g_Engine.setContext( world.getCanvas().rdgeid ); 179 RDGE.globals.engine.setContext( world.getCanvas().rdgeid );
182 180
183 // create the gl buffer 181 // create the gl buffer
184 var gl = world.getGLContext(); 182 var gl = world.getGLContext();
@@ -350,7 +348,7 @@ var Circle = function GLCircle() {
350 348
351 this.recalcTexMapCoords( vrts, uvs ); 349 this.recalcTexMapCoords( vrts, uvs );
352 350
353 return ShapePrimitive.create(vrts, nrms, uvs, indices, g_Engine.getContext().renderer.TRIANGLES, index); 351 return ShapePrimitive.create(vrts, nrms, uvs, indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, index);
354 }; 352 };
355 353
356 this.generateOvalRing = function(xOff, yOff, rotationMat, innerScaleMat, outerScaleMat, nTriangles) { 354 this.generateOvalRing = function(xOff, yOff, rotationMat, innerScaleMat, outerScaleMat, nTriangles) {
@@ -407,7 +405,7 @@ var Circle = function GLCircle() {
407 405
408 this.recalcTexMapCoords( vrts, uvs ); 406 this.recalcTexMapCoords( vrts, uvs );
409 407
410 return ShapePrimitive.create(vrts, nrms, uvs, indices, g_Engine.getContext().renderer.TRIANGLE_STRIP, indices.length); 408 return ShapePrimitive.create(vrts, nrms, uvs, indices, RDGE.globals.engine.getContext().renderer.TRIANGLE_STRIP, indices.length);
411 }; 409 };
412 410
413 this.render = function() { 411 this.render = function() {
@@ -636,100 +634,6 @@ var Circle = function GLCircle() {
636 this.importMaterialsJSON( jObj.materials ); 634 this.importMaterialsJSON( jObj.materials );
637 }; 635 };
638 636
639
640 this.export = function()
641 {
642 var rtnStr = "type: " + this.geomType() + "\n";
643
644 rtnStr += "xoff: " + this._xOffset + "\n";
645 rtnStr += "yoff: " + this._yOffset + "\n";
646 rtnStr += "width: " + this._width + "\n";
647 rtnStr += "height: " + this._height + "\n";
648 rtnStr += "strokeWidth: " + this._strokeWidth + "\n";
649 rtnStr += "innerRadius: " + this._innerRadius + "\n";
650 rtnStr += "strokeStyle: " + this._strokeStyle + "\n";
651
652 if(this._strokeColor.gradientMode) {
653 rtnStr += "strokeGradientMode: " + this._strokeColor.gradientMode + "\n";
654 rtnStr += "strokeColor: " + this.gradientToString(this._strokeColor.color) + "\n";
655 } else {
656 rtnStr += "strokeColor: " + String(this._strokeColor) + "\n";
657 }
658
659 if(this._fillColor.gradientMode) {
660 rtnStr += "fillGradientMode: " + this._fillColor.gradientMode + "\n";
661 rtnStr += "fillColor: " + this.gradientToString(this._fillColor.color) + "\n";
662 } else {
663 rtnStr += "fillColor: " + String(this._fillColor) + "\n";
664 }
665
666 rtnStr += "strokeMat: ";
667 if (this._strokeMaterial) {
668 rtnStr += this._strokeMaterial.getName();
669 } else {
670 rtnStr += MaterialsModel.getDefaultMaterialName();
671 }
672
673 rtnStr += "\n";
674
675 rtnStr += "fillMat: ";
676 if (this._fillMaterial) {
677 rtnStr += this._fillMaterial.getName();
678 } else {
679 rtnStr += MaterialsModel.getDefaultMaterialName();
680 }
681 rtnStr += "\n";
682
683 rtnStr += this.exportMaterials();
684
685 return rtnStr;
686 };
687
688 this.import = function( importStr ) {
689 this._xOffset = Number( this.getPropertyFromString( "xoff: ", importStr ) );
690 this._yOffset = Number( this.getPropertyFromString( "yoff: ", importStr ) );
691 this._width = Number( this.getPropertyFromString( "width: ", importStr ) );
692 this._height = Number( this.getPropertyFromString( "height: ", importStr ) );
693 this._strokeWidth = Number( this.getPropertyFromString( "strokeWidth: ", importStr ) );
694 this._innerRadius = Number( this.getPropertyFromString( "innerRadius: ", importStr ) );
695 this._strokeStyle = this.getPropertyFromString( "strokeStyle: ", importStr );
696 var strokeMaterialName = this.getPropertyFromString( "strokeMat: ", importStr );
697 var fillMaterialName = this.getPropertyFromString( "fillMat: ", importStr );
698 if(importStr.indexOf("fillGradientMode: ") < 0) {
699 this._fillColor = eval( "[" + this.getPropertyFromString( "fillColor: ", importStr ) + "]" );
700 } else {
701 this._fillColor = {};
702 this._fillColor.gradientMode = this.getPropertyFromString( "fillGradientMode: ", importStr );
703 this._fillColor.color = this.stringToGradient(this.getPropertyFromString( "fillColor: ", importStr ));
704 }
705
706 if(importStr.indexOf("strokeGradientMode: ") < 0)
707 {
708 this._strokeColor = eval( "[" + this.getPropertyFromString( "strokeColor: ", importStr ) + "]" );
709 } else {
710 this._strokeColor = {};
711 this._strokeColor.gradientMode = this.getPropertyFromString( "strokeGradientMode: ", importStr );
712 this._strokeColor.color = this.stringToGradient(this.getPropertyFromString( "strokeColor: ", importStr ));
713 }
714
715 var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
716 if (!strokeMat) {
717 console.log( "object material not found in library: " + strokeMaterialName );
718 strokeMat = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() );
719 }
720
721 this._strokeMaterial = strokeMat;
722
723 var fillMat = MaterialsModel.getMaterial( fillMaterialName );
724 if (!fillMat) {
725 console.log( "object material not found in library: " + fillMaterialName );
726 fillMat = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() );
727 }
728 this._fillMaterial = fillMat;
729
730 this.importMaterials( importStr );
731 };
732
733 this.collidesWithPoint = function( x, y ) { 637 this.collidesWithPoint = function( x, y ) {
734// if(x < this._xOffset) return false; 638// if(x < this._xOffset) return false;
735// if(x > (this._xOffset + this._width)) return false; 639// if(x > (this._xOffset + this._width)) return false;
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index f1aa9f8a..bb5b4a9a 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -14,19 +14,19 @@ var GeomObj = function GLGeomObj() {
14 /////////////////////////////////////////////////////////////////////// 14 ///////////////////////////////////////////////////////////////////////
15 // Constants 15 // Constants
16 /////////////////////////////////////////////////////////////////////// 16 ///////////////////////////////////////////////////////////////////////
17 this.GEOM_TYPE_RECTANGLE = 1; 17 this.GEOM_TYPE_RECTANGLE = 1;
18 this.GEOM_TYPE_CIRCLE = 2; 18 this.GEOM_TYPE_CIRCLE = 2;
19 this.GEOM_TYPE_LINE = 3; 19 this.GEOM_TYPE_LINE = 3;
20 this.GEOM_TYPE_PATH = 4; 20 this.GEOM_TYPE_PATH = 4;
21 this.GEOM_TYPE_CUBIC_BEZIER = 5; 21 this.GEOM_TYPE_CUBIC_BEZIER = 5;
22 this.GEOM_TYPE_BRUSH_STROKE = 6; 22 this.GEOM_TYPE_BRUSH_STROKE = 6;
23 this.GEOM_TYPE_UNDEFINED = -1; 23 this.GEOM_TYPE_UNDEFINED = -1;
24 24
25 // Needed for calculating dashed/dotted strokes 25 // Needed for calculating dashed/dotted strokes
26 this.DASH_LENGTH = 0.15; 26 this.DASH_LENGTH = 0.15;
27 this.DOT_LENGTH = 0.05; 27 this.DOT_LENGTH = 0.05;
28 this.GAP_LENGTH = 0.05; 28 this.GAP_LENGTH = 0.05;
29 29
30 /////////////////////////////////////////////////////////////////////// 30 ///////////////////////////////////////////////////////////////////////
31 // Instance variables 31 // Instance variables
32 /////////////////////////////////////////////////////////////////////// 32 ///////////////////////////////////////////////////////////////////////
@@ -40,109 +40,111 @@ var GeomObj = function GLGeomObj() {
40 this.m_world = null; 40 this.m_world = null;
41 41
42 // stroke and fill colors 42 // stroke and fill colors
43 this._strokeColor = [0,0,0,0]; 43 this._strokeColor = [0, 0, 0, 0];
44 this._fillColor = [0,0,0,0]; 44 this._fillColor = [0, 0, 0, 0];
45 45
46 // stroke and fill materials 46 // stroke and fill materials
47 this._fillMaterial = null; 47 this._fillMaterial = null;
48 this._strokeMaterial = null; 48 this._strokeMaterial = null;
49 49
50 // array of primitives - used in RDGE 50 // array of primitives - used in RDGE
51 this._primArray = [];