aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.js30
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.js9
-rwxr-xr-xjs/components/menu/menu.reel/menu.html3
-rwxr-xr-xjs/components/menu/menu.reel/menu.js9
-rwxr-xr-xjs/controllers/elements/shapes-controller.js4
-rw-r--r--js/helper-classes/RDGE/src/tools/compile-rdge-core.bat1
-rw-r--r--js/helper-classes/RDGE/src/tools/compile-rdge-core.sh1
-rw-r--r--js/io/system/ninjalibrary.json2
-rwxr-xr-xjs/lib/drawing/world.js361
-rwxr-xr-xjs/lib/geom/circle.js90
-rwxr-xr-xjs/lib/geom/geom-obj.js29
-rwxr-xr-xjs/lib/geom/line.js1
-rwxr-xr-xjs/lib/geom/rectangle.js105
-rw-r--r--js/lib/geom/shape-primitive.js130
-rwxr-xr-xjs/lib/math/matrix.js9
-rwxr-xr-xjs/lib/rdge/materials/bump-metal-material.js170
-rw-r--r--js/lib/rdge/materials/cloud-material.js439
-rw-r--r--js/lib/rdge/materials/deform-material.js36
-rw-r--r--js/lib/rdge/materials/flag-material.js136
-rwxr-xr-xjs/lib/rdge/materials/flat-material.js99
-rw-r--r--js/lib/rdge/materials/fly-material.js38
-rw-r--r--js/lib/rdge/materials/julia-material.js49
-rw-r--r--js/lib/rdge/materials/keleidoscope-material.js52
-rwxr-xr-xjs/lib/rdge/materials/linear-gradient-material.js250
-rw-r--r--js/lib/rdge/materials/mandel-material.js46
-rwxr-xr-xjs/lib/rdge/materials/material.js306
-rw-r--r--js/lib/rdge/materials/plasma-material.js61
-rw-r--r--js/lib/rdge/materials/pulse-material.js185
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js124
-rwxr-xr-xjs/lib/rdge/materials/radial-gradient-material.js277
-rw-r--r--js/lib/rdge/materials/relief-tunnel-material.js49
-rw-r--r--js/lib/rdge/materials/square-tunnel-material.js45
-rw-r--r--js/lib/rdge/materials/star-material.js53
-rw-r--r--js/lib/rdge/materials/taper-material.js131
-rw-r--r--js/lib/rdge/materials/tunnel-material.js45
-rw-r--r--js/lib/rdge/materials/twist-material.js58
-rw-r--r--js/lib/rdge/materials/twist-vert-material.js325
-rwxr-xr-xjs/lib/rdge/materials/uber-material.js129
-rw-r--r--js/lib/rdge/materials/water-material.js313
-rw-r--r--js/lib/rdge/materials/z-invert-material.js50
-rw-r--r--js/lib/rdge/texture.js332
-rwxr-xr-xjs/mediators/element-mediator.js1
-rwxr-xr-xjs/models/materials-model.js151
-rw-r--r--js/panels/Materials/materials-data.json99
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html13
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.js13
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js181
-rwxr-xr-xjs/panels/color/colorpopup-manager.js56
-rwxr-xr-xjs/tools/LineTool.js2
-rwxr-xr-xjs/tools/SelectionTool.js7
-rwxr-xr-xjs/tools/TagTool.js1
-rwxr-xr-xjs/tools/ToolBase.js2
-rwxr-xr-xjs/tools/drawing-tool-base.js11
-rwxr-xr-xjs/tools/modifier-tool-base.js17
54 files changed, 2803 insertions, 2333 deletions
diff --git a/js/components/menu/menu-entry.reel/menu-entry.js b/js/components/menu/menu-entry.reel/menu-entry.js
index b9c546ed..0f5503f6 100755
--- a/js/components/menu/menu-entry.reel/menu-entry.js
+++ b/js/components/menu/menu-entry.reel/menu-entry.js
@@ -9,18 +9,15 @@ var Component = require("montage/ui/component").Component;
9 9
10exports.MenuEntry = Montage.create(Component, { 10exports.MenuEntry = Montage.create(Component, {
11 topHeader: { 11 topHeader: {
12 value: null, 12 value: null
13 serializable: true
14 }, 13 },
15 14
16 topHeaderText: { 15 topHeaderText: {
17 value: null, 16 value: null
18 serializable: true
19 }, 17 },
20 18
21 subEntries: { 19 subEntries: {
22 value: null, 20 value: null
23 serializable: true
24 }, 21 },
25 22
26 // Reference to the parent Menu component 23 // Reference to the parent Menu component
@@ -36,8 +33,7 @@ exports.MenuEntry = Montage.create(Component, {
36 if(value !== this._menu) { 33 if(value !== this._menu) {
37 this._menu = value; 34 this._menu = value;
38 } 35 }
39 }, 36 }
40 serializable: true
41 }, 37 },
42 38
43 _data: { 39 _data: {
@@ -52,8 +48,7 @@ exports.MenuEntry = Montage.create(Component, {
52 if(this._data !== value) { 48 if(this._data !== value) {
53 this._data = value; 49 this._data = value;
54 } 50 }
55 }, 51 }
56 serializable: true
57 }, 52 },
58 53
59 select: { 54 select: {
@@ -79,22 +74,20 @@ exports.MenuEntry = Montage.create(Component, {
79 return this._menuIsActive; 74 return this._menuIsActive;
80 }, 75 },
81 set: function(value) { 76 set: function(value) {
82 if(value) this.topHeader.addEventListener("mouseover", this, false); 77 if(value) this.element.addEventListener("mouseover", this, false);
83 } 78 }
84 }, 79 },
85 80
86 handleClick: { 81 captureMousedown: {
87 value: function(event) { 82 value: function(event) {
88 // TODO: Hack! Rework this! 83 // TODO: Hack! Rework this!
89 this.parentComponent.ownerComponent.toggleActivation(this); 84 this.parentComponent.ownerComponent.toggleActivation(this);
90// this._menu.toggleActivation(this);
91 } 85 }
92 }, 86 },
93 87
94 handleMouseover: { 88 handleMouseover: {
95 value: function(event) { 89 value: function(event) {
96 this.parentComponent.ownerComponent.activeEntry = this; 90 this.parentComponent.ownerComponent.activeEntry = this;
97// this._menu.activeEntry = this;
98 } 91 }
99 }, 92 },
100 93
@@ -105,14 +98,7 @@ exports.MenuEntry = Montage.create(Component, {
105 98
106 this.topHeaderText.innerHTML = this.data.header; 99 this.topHeaderText.innerHTML = this.data.header;
107 100
108 this.element.addEventListener("click", this, false); 101 this.element.addEventListener("mousedown", this, true);
109
110 Object.defineBinding(this, "menuIsActive", {
111 boundObject: this._menu,
112 boundObjectPropertyPath: "active",
113 oneway: true
114 });
115
116 } 102 }
117 } 103 }
118}); \ No newline at end of file 104}); \ No newline at end of file
diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js
index f9a625a3..3a5bf4ab 100755
--- a/js/components/menu/menu-item.reel/menu-item.js
+++ b/js/components/menu/menu-item.reel/menu-item.js
@@ -10,18 +10,15 @@ var Component = require("montage/ui/component").Component;
10exports.MenuItem = Montage.create(Component, { 10exports.MenuItem = Montage.create(Component, {
11 11
12 itemBackground: { 12 itemBackground: {
13 value: null, 13 value: null
14 serializable: true
15 }, 14 },
16 15
17 itemText: { 16 itemText: {
18 value: null, 17 value: null
19 serializable: true
20 }, 18 },
21 19
22 subMenu: { 20 subMenu: {
23 value: null, 21 value: null
24 serializable: true
25 }, 22 },
26