aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--assets/CanvasRuntime.js4
-rw-r--r--assets/descriptor.json40
-rwxr-xr-xjs/data/pi/pi-data.js22
-rwxr-xr-xjs/document/html-document.js8
-rw-r--r--js/io/system/ninjalibrary.js6
-rw-r--r--js/mediators/io-mediator.js10
6 files changed, 68 insertions, 22 deletions
diff --git a/assets/CanvasRuntime.js b/assets/CanvasRuntime.js
index 5caf72ee..445050bc 100644
--- a/assets/CanvasRuntime.js
+++ b/assets/CanvasRuntime.js
@@ -852,12 +852,12 @@ function RuntimeOval()
852 // translate 852 // translate
853 var xCtr = 0.5*world.getViewportWidth() + this._xOffset, 853 var xCtr = 0.5*world.getViewportWidth() + this._xOffset,
854 yCtr = 0.5*world.getViewportHeight() + this._yOffset; 854 yCtr = 0.5*world.getViewportHeight() + this._yOffset;
855 var mat = Matrix.create( [ 855 var mat = [
856 [ xScale, 0.0, 0.0, xCtr], 856 [ xScale, 0.0, 0.0, xCtr],
857 [ 0.0, yScale, 0.0, yCtr], 857 [ 0.0, yScale, 0.0, yCtr],
858 [ 0.0, 0.0, 1.0, 0.0], 858 [ 0.0, 0.0, 1.0, 0.0],
859 [ 0.0, 0.0, 0.0, 1.0] 859 [ 0.0, 0.0, 0.0, 1.0]
860 ] ); 860 ];
861 861
862 // get a bezier representation of the circle 862 // get a bezier representation of the circle
863 var bezPts = this.circularArcToBezier( [0,0,0], [1,0,0], 2.0*Math.PI ); 863 var bezPts = this.circularArcToBezier( [0,0,0], [1,0,0], 2.0*Math.PI );
diff --git a/assets/descriptor.json b/assets/descriptor.json
index 2b955c40..0da58755 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -6,31 +6,53 @@
6 "files": [ 6 "files": [
7 "CanvasRuntime.js", 7 "CanvasRuntime.js",
8 "rdge-compiled.js", 8 "rdge-compiled.js",
9 "images/black.png",
10 "images/blue.png",
11 "images/BoxB2_AO.png", 9 "images/BoxB2_AO.png",
12 "images/BoxB2_DM.png",
13 "images/cubelight.png",
14 "images/grey.png", 10 "images/grey.png",
15 "images/material_paint.png",
16 "images/metal.png",
17 "images/normalMap.png",
18 "images/random_normal.png",
19 "images/rocky-diffuse.jpg", 11 "images/rocky-diffuse.jpg",
12 "images/BoxB2_DM.png",
13 "images/material_paint.png",
20 "images/rocky-normal.jpg", 14 "images/rocky-normal.jpg",
15 "images/black.png",
16 "images/metal.png",
21 "images/rocky-spec.jpg", 17 "images/rocky-spec.jpg",
18 "images/blue.png",
19 "images/normalMap.png",
22 "images/silver.png", 20 "images/silver.png",
21 "images/cubelight.png",
22 "images/random_normal.png",
23 "images/white.png", 23 "images/white.png",
24 "shaders/Basic.frag.glsl", 24 "shaders/Basic.frag.glsl",
25 "shaders/TwistVert.vert.glsl",
25 "shaders/Basic.vert.glsl", 26 "shaders/Basic.vert.glsl",
27 "shaders/Water.frag.glsl",
28 "shaders/Deform.frag.glsl",
29 "shaders/Water2.frag.glsl",
30 "shaders/Flag.vert.glsl",
31 "shaders/ZInvert.frag.glsl",
32 "shaders/Fly.frag.glsl",
26 "shaders/linearGradient.frag.glsl", 33 "shaders/linearGradient.frag.glsl",
34 "shaders/Julia.frag.glsl",
27 "shaders/linearGradient.vert.glsl", 35 "shaders/linearGradient.vert.glsl",
36 "shaders/Keleidoscope.frag.glsl",
37 "shaders/plasma.frag.glsl",
38 "shaders/Mandel.frag.glsl",
39 "shaders/plasma.vert.glsl",
40 "shaders/Pulse.frag.glsl",
41 "shaders/radialBlur.frag.glsl",
42 "shaders/ReliefTunnel.frag.glsl",
28 "shaders/radialGradient.frag.glsl", 43 "shaders/radialGradient.frag.glsl",
44 "shaders/SquareTunnel.frag.glsl",
29 "shaders/radialGradient.vert.glsl", 45 "shaders/radialGradient.vert.glsl",
46 "shaders/Star.frag.glsl",
30 "shaders/test_fshader.glsl", 47 "shaders/test_fshader.glsl",
48 "shaders/Taper.frag.glsl",
31 "shaders/test_fshader_full.glsl", 49 "shaders/test_fshader_full.glsl",
50 "shaders/Taper.vert.glsl",
32 "shaders/test_vshader.glsl", 51 "shaders/test_vshader.glsl",
52 "shaders/Tunnel.frag.glsl",
33 "shaders/ub_fshader.glsl", 53 "shaders/ub_fshader.glsl",
34 "shaders/ub_vshader.glsl" 54 "shaders/Twist.frag.glsl",
55 "shaders/ub_vshader.glsl",
56 "shaders/TwistVert.frag.glsl"
35 ] 57 ]
36} \ No newline at end of file 58} \ No newline at end of file
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index c42d9082..ba03c347 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -331,10 +331,11 @@ exports.PiData = Montage.create( Montage, {
331 id: "tlRadius", 331 id: "tlRadius",
332 prop : "tlRadius", 332 prop : "tlRadius",
333 label: "TL", 333 label: "TL",
334 valueMutator: parseFloat,
334 value : 0, 335 value : 0,
335 min : 0, 336 min : 0,
336 max : 100, 337 max : 100,
337 unit : "%", 338 unit : "px",
338 acceptableUnits: ["px", "pt", "%"] 339 acceptableUnits: ["px", "pt", "%"]
339 }, 340 },
340 { 341 {
@@ -342,10 +343,12 @@ exports.PiData = Montage.create( Montage, {
342 id : "trRadius", 343 id : "trRadius",
343 prop : "trRadius", 344 prop : "trRadius",
344 label : "TR", 345 label : "TR",
346 valueMutator: parseFloat,
345 min : 0, 347 min : 0,
346 max : 100, 348 max : 100,
347 unit : "%", 349 unit : "px",
348 acceptableUnits: ["px", "pt", "%"] 350 acceptableUnits: ["px", "pt", "%"],
351 divider: true
349 } 352 }
350 ], 353 ],
351 [ 354 [
@@ -354,9 +357,10 @@ exports.PiData = Montage.create( Montage, {
354 id : "blRadius", 357 id : "blRadius",
355 prop : "blRadius", 358 prop : "blRadius",
356 label : "BL", 359 label : "BL",
360 valueMutator: parseFloat,
357 min : 0, 361 min : 0,
358 max : 100, 362 max : 100,
359 unit : "%", 363 unit : "px",
360 acceptableUnits: ["px", "pt", "%"] 364 acceptableUnits: ["px", "pt", "%"]
361 }, 365 },
362 { 366 {
@@ -364,9 +368,10 @@ exports.PiData = Montage.create( Montage, {
364 id : "brRadius", 368 id : "brRadius",
365 prop : "brRadius", 369 prop : "brRadius",
366 label : "BR", 370 label : "BR",
371 valueMutator: parseFloat,
367 min : 0, 372 min : 0,
368 max : 100, 373 max : 100,
369 unit : "%", 374 unit : "px",
370 acceptableUnits: ["px", "pt", "%"] 375 acceptableUnits: ["px", "pt", "%"]
371 } 376 }
372 ] 377 ]
@@ -390,6 +395,7 @@ exports.PiData = Montage.create( Montage, {
390 { 395 {
391 type: "dropdown", 396 type: "dropdown",
392 id: "strokeMaterial", 397 id: "strokeMaterial",
398 prop: "strokeMaterial",
393 label: "Stroke", 399 label: "Stroke",
394 labelField: "_name", 400 labelField: "_name",
395 dataField: "_name", 401 dataField: "_name",
@@ -402,6 +408,7 @@ exports.PiData = Montage.create( Montage, {
402 { 408 {
403 type: "dropdown", 409 type: "dropdown",
404 id: "fillMaterial", 410 id: "fillMaterial",
411 prop: "fillMaterial",
405 label: "Fill", 412 label: "Fill",
406 labelField: "_name", 413 labelField: "_name",
407 dataField: "_name", 414 dataField: "_name",
@@ -524,7 +531,8 @@ exports.PiData = Montage.create( Montage, {
524 type: "hottext", 531 type: "hottext",
525 id: "innerRadius", 532 id: "innerRadius",
526 prop: "innerRadius", 533 prop: "innerRadius",
527 label: "Inner Radius", 534 label: "Inner R",
535 valueMutator: parseFloat,
528 value : 0, 536 value : 0,
529 min : 0, 537 min : 0,
530 max : 100, 538 max : 100,
@@ -553,6 +561,7 @@ exports.PiData = Montage.create( Montage, {
553 { 561 {
554 type: "dropdown", 562 type: "dropdown",
555 id: "strokeMaterial", 563 id: "strokeMaterial",
564 prop: "strokeMaterial",
556 label: "Stroke", 565 label: "Stroke",
557 labelField: "_name", 566 labelField: "_name",
558 dataField: "_name", 567 dataField: "_name",
@@ -565,6 +574,7 @@ exports.PiData = Montage.create( Montage, {
565 { 574 {
566 type: "dropdown", 575 type: "dropdown",
567 id: "fillMaterial", 576 id: "fillMaterial",
577 prop: "fillMaterial",
568 label: "Fill", 578 label: "Fill",
569 labelField: "_name", 579 labelField: "_name",
570 dataField: "_name", 580 dataField: "_name",
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 79450494..051490f5 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -871,8 +871,12 @@ exports.HTMLDocument = Montage.create(TextDocument, {
871 value: function () { 871 value: function () {
872 //TODO: Add logic to handle save before preview 872 //TODO: Add logic to handle save before preview
873 this.application.ninja.documentController.handleExecuteSaveAll(null); 873 this.application.ninja.documentController.handleExecuteSaveAll(null);
874 //Launching 'blank' tab for testing movie 874 //Temp check for webGL Hack
875 window.open(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]); 875 if (this.application.ninja.documentController.activeDocument.glData.length && this.application.ninja.documentController.activeDocument.glData.length > 0) {
876 setTimeout(function () {window.open(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);}.bind(this), 3500);
877 } else {
878