aboutsummaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorJonathan Duran2012-07-17 09:30:22 -0700
committerJonathan Duran2012-07-17 09:30:22 -0700
commit53051672a62208fbc96957719d8285fac6431ed6 (patch)
tree79d542ee811044e8af2ef84aa0d6662c6eb895c4 /assets
parent7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parent5146f224258929415adf4a8022e492454b4e2476 (diff)
downloadninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts: js/panels/Timeline/DragDrop.js js/panels/Timeline/Keyframe.reel/Keyframe.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Span.reel/Span.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css js/panels/Timeline/Tween.reel/Tween.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'assets')
-rw-r--r--assets/canvas-runtime.js4075
-rw-r--r--assets/descriptor.json13
-rw-r--r--assets/shaders/Basic.frag.glsl23
-rwxr-xr-xassets/shaders/Basic.vert.glsl29
-rw-r--r--assets/shaders/BasicTex.frag.glsl25
-rw-r--r--assets/shaders/Cloud.frag.glsl33
-rw-r--r--assets/shaders/Cloud.vert.glsl55
-rw-r--r--assets/shaders/Deform.frag.glsl30
-rw-r--r--assets/shaders/Flag.frag.glsl23
-rw-r--r--assets/shaders/Flag.vert.glsl48
-rw-r--r--assets/shaders/Fly.frag.glsl24
-rw-r--r--assets/shaders/Julia.frag.glsl26
-rw-r--r--assets/shaders/Keleidoscope.frag.glsl29
-rw-r--r--assets/shaders/Mandel.frag.glsl58
-rw-r--r--assets/shaders/Pulse.frag.glsl1
-rw-r--r--assets/shaders/ReliefTunnel.frag.glsl38
-rw-r--r--assets/shaders/SquareTunnel.frag.glsl22
-rw-r--r--assets/shaders/Star.frag.glsl31
-rw-r--r--assets/shaders/Taper.frag.glsl23
-rw-r--r--assets/shaders/Taper.vert.glsl175
-rw-r--r--assets/shaders/Tunnel.frag.glsl24
-rw-r--r--assets/shaders/Twist.frag.glsl26
-rw-r--r--assets/shaders/TwistVert.frag.glsl31
-rw-r--r--assets/shaders/TwistVert.vert.glsl107
-rw-r--r--assets/shaders/ZInvert.frag.glsl26
-rwxr-xr-xassets/shaders/linearGradient.frag.glsl91
-rwxr-xr-xassets/shaders/linearGradient.vert.glsl53
-rw-r--r--assets/shaders/radialBlur.frag.glsl81
-rw-r--r--assets/shaders/radialGradient.frag.glsl93
-rw-r--r--assets/shaders/radialGradient.vert.glsl31
-rwxr-xr-xassets/shaders/test_fshader.glsl81
-rwxr-xr-xassets/shaders/test_fshader_full.glsl53
-rwxr-xr-xassets/shaders/test_vshader.glsl85
-rwxr-xr-xassets/shaders/ub_fshader.glsl455
-rwxr-xr-xassets/shaders/ub_vshader.glsl255
35 files changed, 2989 insertions, 3284 deletions
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index ce392f34..4ab377c6 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -1,24 +1,25 @@
1/* <copyright> 1/* <copyright>
2Copyright (c) 2012, Motorola Mobility, Inc 2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved. 3All Rights Reserved.
4BSD License.
5 4
6Redistribution and use in source and binary forms, with or without 5Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met: 6modification, are permitted provided that the following conditions are met:
8 7
9 - Redistributions of source code must retain the above copyright notice, 8* Redistributions of source code must retain the above copyright notice,
10 this list of conditions and the following disclaimer. 9 this list of conditions and the following disclaimer.
11 - Redistributions in binary form must reproduce the above copyright 10
12 notice, this list of conditions and the following disclaimer in the 11* Redistributions in binary form must reproduce the above copyright notice,
13 documentation and/or other materials provided with the distribution. 12 this list of conditions and the following disclaimer in the documentation
14 - Neither the name of Motorola Mobility nor the names of its contributors 13 and/or other materials provided with the distribution.
15 may be used to endorse or promote products derived from this software 14
16 without specific prior written permission. 15* Neither the name of Motorola Mobility LLC nor the names of its
16 contributors may be used to endorse or promote products derived from this
17 software without specific prior written permission.
17 18
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -36,42 +37,42 @@ var NinjaCvsRt = NinjaCvsRt || {};
36window.addEventListener('load', loadCanvasData, false); 37window.addEventListener('load', loadCanvasData, false);
37//Load data function (on document loaded) 38//Load data function (on document loaded)
38function loadCanvasData (e) { 39function loadCanvasData (e) {
39 //Cleaning up events 40 //Cleaning up events
40 window.removeEventListener('load', loadCanvasData, false); 41 window.removeEventListener('load', loadCanvasData, false);
41 //Getting tag with data, MUST contain attribute 42 //Getting tag with data, MUST contain attribute
42 var xhr, tag = document.querySelectorAll(['script[data-ninja-canvas-lib]'])[0]; 43 var xhr, tag = document.querySelectorAll(['script[data-ninja-canvas-lib]'])[0];
43 //Checking for data to be external file 44 //Checking for data to be external file
44 if (tag.getAttribute('data-ninja-canvas-json') !== null) { 45 if (tag.getAttribute('data-ninja-canvas-json') !== null) {
45 //Loading JSON data 46 //Loading JSON data
46 xhr = new XMLHttpRequest(); 47 xhr = new XMLHttpRequest();
47 xhr.open("GET", tag.getAttribute('data-ninja-canvas-json'), false); 48 xhr.open("GET", tag.getAttribute('data-ninja-canvas-json'), false);
48 xhr.send(); 49 xhr.send();
49 //Checking for data 50 //Checking for data
50 if (xhr.readyState === 4) { 51 if (xhr.readyState === 4) {
51 //Calling method to initialize all webGL/canvas(es) 52 //Calling method to initialize all webGL/canvas(es)
52 NinjaCvsRt.initWebGl(document.body, tag.getAttribute('data-ninja-canvas-libpath'), xhr.response); 53 NinjaCvsRt.initWebGl(document.body, tag.getAttribute('data-ninja-canvas-libpath'), xhr.response);
53 } else { 54 } else {
54 //TODO: Add error for users 55 //TODO: Add error for users
55 } 56 }
56 } else {//Data in document itself 57 } else {//Data in document itself
57 //Calling method to initialize all webGL/canvas(es) 58 //Calling method to initialize all webGL/canvas(es)
58 NinjaCvsRt.initWebGl(document.body, tag.getAttribute('data-ninja-canvas-libpath'), document.querySelectorAll(['script[data-ninja-canvas]'])[0].innerHTML); 59 NinjaCvsRt.initWebGl(document.body, tag.getAttribute('data-ninja-canvas-libpath'), document.querySelectorAll(['script[data-ninja-canvas]'])[0].innerHTML);
59 } 60 }
60} 61}
61 62
62/////////////////////////////////////////////////////////////////////// 63///////////////////////////////////////////////////////////////////////
63//Loading webGL/canvas data 64//Loading webGL/canvas data
64NinjaCvsRt.initWebGl = function (rootElement, directory, data) { 65NinjaCvsRt.initWebGl = function (rootElement, directory, data) {
65 var cvsDataMngr, ninjaWebGlData = JSON.parse((data.replace('(', '')).replace(')', '')); 66 var cvsDataMngr, ninjaWebGlData = JSON.parse((data.replace('(', '')).replace(')', ''));
66 if (ninjaWebGlData && ninjaWebGlData.data) { 67 if (ninjaWebGlData && ninjaWebGlData.data) {
67 for (var n=0; ninjaWebGlData.data[n]; n++) { 68 for (var n=0; ninjaWebGlData.data[n]; n++) {
68 ninjaWebGlData.data[n] = unescape(ninjaWebGlData.data[n]); 69 ninjaWebGlData.data[n] = unescape(ninjaWebGlData.data[n]);
69 } 70 }
70 } 71 }
71 //Creating data manager 72 //Creating data manager
72 cvsDataMngr = Object.create(NinjaCvsRt.CanvasDataManager, {}); 73 cvsDataMngr = Object.create(NinjaCvsRt.CanvasDataManager, {});
73 //Loading data to canvas(es) 74 //Loading data to canvas(es)
74 cvsDataMngr.loadGLData(rootElement, ninjaWebGlData.data, directory); 75 cvsDataMngr.loadGLData(rootElement, ninjaWebGlData.data, directory);
75}; 76};
76 77
77/////////////////////////////////////////////////////////////////////// 78///////////////////////////////////////////////////////////////////////
@@ -80,64 +81,64 @@ NinjaCvsRt.initWebGl = function (rootElement, directory, data) {
80/////////////////////////////////////////////////////////////////////// 81///////////////////////////////////////////////////////////////////////
81NinjaCvsRt.CanvasDataManager = Object.create(Object.prototype, { 82NinjaCvsRt.CanvasDataManager = Object.create(Object.prototype, {
82 83
83 loadGLData: { 84 loadGLData: {
84 value: function(root, valueArray, assetPath) { 85 value: function(root, valueArray, assetPath) {
85 if (assetPath) 86 if (assetPath)
86 this._assetPath = assetPath.slice(); 87 this._assetPath = assetPath.slice();
87 88
88 var value = valueArray; 89 var value = valueArray;
89 var nWorlds = value.length; 90 var nWorlds = value.length;
90 for (var i=0; i<nWorlds; i++) 91 for (var i=0; i<nWorlds; i++)
91 { 92 {
92 var importStr = value[i]; 93 var importStr = value[i];
93 94
94 // there should be some version information in 95 // there should be some version information in
95 // the form of 'v0.0;' Pull that off. (the trailing ';' should 96 // the form of 'v0.0;' Pull that off. (the trailing ';' should
96 // be in the first 24 characters). 97 // be in the first 24 characters).
97 var index = importStr.indexOf( ';' ); 98 var index = importStr.indexOf( ';' );
98 if ((importStr[0] === 'v') && (index < 24)) 99 if ((importStr[0] === 'v') && (index < 24))
99 { 100 {
100 // JSON format. pull off the version info 101 // JSON format. pull off the version info
101 importStr = importStr.substr( index+1 ); 102 importStr = importStr.substr( index+1 );
102 103
103 var jObj = JSON.parse( importStr ); 104 var jObj = JSON.parse( importStr );
104 var id = jObj.id; 105 var id = jObj.id;
105 if (id) 106 if (id)
106 { 107 {
107 var canvas = this.findCanvasWithID( id, root ); 108 var canvas = this.findCanvasWithID( id, root );
108 if (canvas) 109 if (canvas)
109 { 110 {
110// new NinjaCvsRt.GLRuntime( canvas, jObj, assetPath ); 111// new NinjaCvsRt.GLRuntime( canvas, jObj, assetPath );
111 var glRt = Object.create(NinjaCvsRt.GLRuntime, {}); 112 var glRt = Object.create(NinjaCvsRt.GLRuntime, {});
112 glRt.renderWorld(canvas, jObj, this._assetPath); 113 glRt.renderWorld(canvas, jObj, this._assetPath);
113 } 114