aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-24 12:08:49 -0800
committerPushkar Joshi2012-02-24 12:08:49 -0800
commit03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
treec51112223ceb9121cd595a60335eb2795215590f /js/helper-classes
parentfcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
downloadninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
Merge branch 'pentool' into brushtool
Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
Diffstat (limited to 'js/helper-classes')
-rwxr-xr-x[-rw-r--r--]js/helper-classes/3D/GLMatrix/gl-matrix.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/3D/GLMatrix/notice.txt0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/3D/LinePlaneIntersectRec.js3
-rwxr-xr-x[-rw-r--r--]js/helper-classes/3D/ParseUtils.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/3D/Rectangle.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/3D/StageLine.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/3D/draw-utils.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/3D/element-planes.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/3D/glUtils.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/3D/hit-record.js6
-rwxr-xr-x[-rw-r--r--]js/helper-classes/3D/math-utils.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/3D/snap-2d-record.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/3D/snap-manager.js1
-rwxr-xr-x[-rw-r--r--]js/helper-classes/3D/vec-utils.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/3D/view-utils.js42
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/GLAnchorPoint.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/GLBrushStroke.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/GLCircle.js13
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/GLGeomObj.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/GLLight.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/GLLine.js644
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/GLMaterial.js11
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/GLPath.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/GLRectangle.js69
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/GLSubpath.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/GLWorld.js84
-rw-r--r--js/helper-classes/RDGE/Materials/BrickMaterial.js231
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/Materials/BumpMetalMaterial.js48
-rw-r--r--js/helper-classes/RDGE/Materials/DeformMaterial.js133
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/Materials/FlatMaterial.js60
-rw-r--r--js/helper-classes/RDGE/Materials/FlyMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js215
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/Materials/LinearGradientMaterial.js148
-rw-r--r--js/helper-classes/RDGE/Materials/PulseMaterial.js32
-rw-r--r--js/helper-classes/RDGE/Materials/QuiltMaterial.js168
-rw-r--r--js/helper-classes/RDGE/Materials/RadialBlurMaterial.js13
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/Materials/RadialGradientMaterial.js87
-rw-r--r--js/helper-classes/RDGE/Materials/ReliefTunnelMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/SquareTunnelMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/StarMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/StitchMaterial.js119
-rw-r--r--js/helper-classes/RDGE/Materials/TaperMaterial.js223
-rw-r--r--js/helper-classes/RDGE/Materials/TunnelMaterial.js2
-rw-r--r--js/helper-classes/RDGE/Materials/TwistVertMaterial.js248
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/Materials/UberMaterial.js56
-rw-r--r--js/helper-classes/RDGE/Materials/WaterMaterial.js133
-rw-r--r--js/helper-classes/RDGE/Materials/ZInvertMaterial.js133
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/MaterialsLibrary.js91
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/precompiled.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/rdge-compiled.js57
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/MeshManager.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/RenderInitProcs.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/RenderProcs.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/ScreenQuad.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/ShaderManager.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/TextureManager.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/animation.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/box.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/camera.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/engine.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/fx/blur.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/fx/ssao.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/init_state.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/input.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/jpass.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/jshader.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/lightmanager.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/math/mat4.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/math/quat.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/math/vec2.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/math/vec3.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/math/vec4.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/objectManager.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/particle.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/precompiled.js10
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/renderUtils.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/rendercontext.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/renderer.js22
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/run_state.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/runtime.js14
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/scenegraph.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/scenegraphNodes.js8
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/shadowLight.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/sockets.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/ubershader.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/util/dbgpanel.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/util/fpsTracker.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/util/statTracker.js0
-rwxr-xr-x[-rw-r--r--]js/helper-classes/RDGE/src/core/script/utilities.js0
-rw-r--r--js/helper-classes/RDGE/src/tools/compile-rdge-core.bat4
-rw-r--r--js/helper-classes/RDGE/src/tools/compile-rdge-core.sh3
-rw-r--r--js/helper-classes/RDGE/src/tools/compiler.jarbin0 -> 4927265 bytes
-rw-r--r--js/helper-classes/RDGE/src/tools/rdge-compiled.js454
-rw-r--r--js/helper-classes/Utils.js33
94 files changed, 2758 insertions, 1392 deletions
diff --git a/js/helper-classes/3D/GLMatrix/gl-matrix.js b/js/helper-classes/3D/GLMatrix/gl-matrix.js
index 811ed5cd..811ed5cd 100644..100755
--- a/js/helper-classes/3D/GLMatrix/gl-matrix.js
+++ b/js/helper-classes/3D/GLMatrix/gl-matrix.js
diff --git a/js/helper-classes/3D/GLMatrix/notice.txt b/js/helper-classes/3D/GLMatrix/notice.txt
index 8903aa97..8903aa97 100644..100755
--- a/js/helper-classes/3D/GLMatrix/notice.txt
+++ b/js/helper-classes/3D/GLMatrix/notice.txt
diff --git a/js/helper-classes/3D/LinePlaneIntersectRec.js b/js/helper-classes/3D/LinePlaneIntersectRec.js
index e075dd3d..cb172bf7 100644..100755
--- a/js/helper-classes/3D/LinePlaneIntersectRec.js
+++ b/js/helper-classes/3D/LinePlaneIntersectRec.js
@@ -42,9 +42,6 @@ var LinePlaneIntersectRec = exports.LinePlaneIntersectRec = Object.create(Object
42 setDeltaVis: { value: function(d) { this._deltaVis = d; } }, 42 setDeltaVis: { value: function(d) { this._deltaVis = d; } },
43 getDeltaVis: { value: function() { return this._deltaVis; } }, 43 getDeltaVis: { value: function() { return this._deltaVis; } },
44 44
45 getElementPlanes: { value: function() { return this._deltaVis; } },
46 setElementPlanes: { value: function(p) { this._elementPlanes = p; } },
47
48 setNext: { value: function(n) { this._next = n; } }, 45 setNext: { value: function(n) { this._next = n; } },
49 getNext: { value: function() { return this._next; } }, 46 getNext: { value: function() { return this._next; } },
50 47
diff --git a/js/helper-classes/3D/ParseUtils.js b/js/helper-classes/3D/ParseUtils.js
index 556253e9..556253e9 100644..100755
--- a/js/helper-classes/3D/ParseUtils.js
+++ b/js/helper-classes/3D/ParseUtils.js
diff --git a/js/helper-classes/3D/Rectangle.js b/js/helper-classes/3D/Rectangle.js
index e797eedf..e797eedf 100644..100755
--- a/js/helper-classes/3D/Rectangle.js
+++ b/js/helper-classes/3D/Rectangle.js
diff --git a/js/helper-classes/3D/StageLine.js b/js/helper-classes/3D/StageLine.js
index e0e7a8e3..e0e7a8e3 100644..100755
--- a/js/helper-classes/3D/StageLine.js
+++ b/js/helper-classes/3D/StageLine.js
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index c07391db..c07391db 100644..100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
diff --git a/js/helper-classes/3D/element-planes.js b/js/helper-classes/3D/element-planes.js
index 7ccf311e..7ccf311e 100644..100755
--- a/js/helper-classes/3D/element-planes.js
+++ b/js/helper-classes/3D/element-planes.js
diff --git a/js/helper-classes/3D/glUtils.js b/js/helper-classes/3D/glUtils.js
index f6d075f8..f6d075f8 100644..100755
--- a/js/helper-classes/3D/glUtils.js
+++ b/js/helper-classes/3D/glUtils.js
diff --git a/js/helper-classes/3D/hit-record.js b/js/helper-classes/3D/hit-record.js
index 5546cc5a..2c60adc6 100644..100755
--- a/js/helper-classes/3D/hit-record.js
+++ b/js/helper-classes/3D/hit-record.js
@@ -139,12 +139,10 @@ var HitRecord = exports.HitRecord = Object.create(Object.prototype,
139 139
140 isSomeGridTypeSnap : { 140 isSomeGridTypeSnap : {
141 value: function() { 141 value: function() {
142 return 142 return ((this._type == this.SNAP_TYPE_GRID_VERTEX) ||
143 (
144