Skip to content

Commit b96c808

Browse files
author
Matt Karl
committed
Reorganized code, using Jade, New Project CSS tweaks
1 parent 8de31fc commit b96c808

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+777
-622
lines changed

‎.gitignore‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,23 @@ node_modules
33
components
44
cache
55
docs
6+
deploy/*.html
67
*.log
78
*.map
89
deploy/assets/js/*.js
910
deploy/assets/css/*.css
1011
deploy/tasks-test.html
11-
deploy/assets/templates/default
12+
deploy/assets/templates/default
13+
deploy/captions.html
14+
15+
deploy/index.html
16+
17+
deploy/new.html
18+
19+
deploy/preview.html
20+
21+
deploy/remote.html
22+
23+
deploy/tasks-terminal.html
24+
25+
deploy/tasks.html

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "SpringRollStudio",
3-
"version": "0.2.2",
3+
"version": "0.2.3",
44
"private": true,
55
"dependencies": {
66
"jqueryui": "*",

‎deploy/assets/templates/default/springroll-template.json‎

Lines changed: 185 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"name" : "Default",
33
"id" : "io.springroll.default",
4-
"version" : "1.2.0",
4+
"version" : "1.3.0",
55
"github": "SpringRoll/SpringRollTemplate",
66
"rename" : {
77
"gitignore" : ".gitignore",
88
"bowerrc" : ".bowerrc",
99
"project.md": "README.md",
1010
"bower": "bower.json"
1111
},
12-
"required": ["springroll.Core"],
12+
"required": ["core"],
1313
"modules": [
1414
{
15-
"id": "springroll.Core",
15+
"id": "core",
1616
"name": "SpringRoll Core",
1717
"main": "components/springroll/dist/core.min.js",
1818
"mainDebug": "components/springroll/dist/core.js",
@@ -23,60 +23,133 @@
2323
"librariesDebug": "components/preloadjs/lib/preloadjs.combined.js"
2424
},
2525
{
26-
"id": "springroll.CreateJSDisplay",
27-
"name": "CreateJS Display",
28-
"main": "components/springroll/dist/modules/display-createjs.min.js",
29-
"mainDebug": "components/springroll/dist/modules/display-createjs.js",
26+
"id": "easeljs-display",
27+
"name": "EaselJS Display",
28+
"description": "Display plugin which uses EaselJS to render the canvas",
29+
"main": "components/springroll/dist/modules/easeljs-display.min.js",
30+
"mainDebug": "components/springroll/dist/modules/easeljs-display.js",
31+
"bower": {
32+
"easeljs": "https://github.com/SpringRoll/EaselJS.git"
33+
},
34+
"libraries": [
35+
"components/easeljs/lib/easeljs.min.js"
36+
],
37+
"librariesDebug": [
38+
"components/easeljs/lib/easeljs.combined.js"
39+
],
40+
"depends": ["core"],
41+
"display": "springroll.easeljs.EaselJSDisplay"
42+
},
43+
{
44+
"id": "easeljs-animation",
45+
"name": "EaselJS Animation",
46+
"description": "Special animation tools for streaming audio and playing Bitmap MovieClips",
47+
"main": "components/springroll/dist/modules/easeljs-animation.min.js",
48+
"mainDebug": "components/springroll/dist/modules/easeljs-animation.js",
3049
"bower": {
31-
"easeljs": "https://github.com/SpringRoll/EaselJS.git",
3250
"tweenjs": "https://github.com/SpringRoll/TweenJS.git"
3351
},
3452
"libraries": [
3553
"components/tweenjs/lib/tweenjs.min.js",
36-
"components/easeljs/lib/easeljs.min.js",
3754
"components/easeljs/lib/movieclip.min.js"
3855
],
3956
"librariesDebug": [
4057
"components/tweenjs/lib/tweenjs.combined.js",
41-
"components/easeljs/lib/easeljs.combined.js",
4258
"components/easeljs/lib/movieclip.combined.js"
4359
],
44-
"depends": ["springroll.Core"],
45-
"display": "springroll.createjs.CreateJSDisplay"
60+
"depends": ["easeljs-display"]
61+
},
62+
{
63+
"id": "easeljs-interface",
64+
"name": "EaselJS Animation",
65+
"description": "Drag management and basic buttons for EaselJS",
66+
"main": "components/springroll/dist/modules/easeljs-interface.min.js",
67+
"mainDebug": "components/springroll/dist/modules/easeljs-interface.js",
68+
"depends": ["easeljs-display"]
4669
},
4770
{
48-
"id": "springroll.PixiDisplay",
71+
"id": "easeljs-utils",
72+
"name": "EaselJS Utilities",
73+
"description": "Contains bitmap utilities for managing, loading and formatting bitmaps",
74+
"main": "components/springroll/dist/modules/easeljs-utils.min.js",
75+
"mainDebug": "components/springroll/dist/modules/easeljs-utils.js",
76+
"depends": ["easeljs-display"]
77+
},
78+
{
79+
"id": "easeljs-cutscene",
80+
"name": "EaselJS Cutscene",
81+
"description": "Module for playing a cinematic scene (audio and timeline) with EaselJS",
82+
"main": "components/springroll/dist/modules/easeljs-cutscene.min.js",
83+
"mainDebug": "components/springroll/dist/modules/easeljs-cutscene.js",
84+
"depends": [
85+
"easeljs-display",
86+
"easeljs-animation",
87+
"easeljs-utils",
88+
"tasks"
89+
]
90+
},
91+
{
92+
"id": "pixi-display",
4993
"name": "Pixi.js Display",
50-
"main": "components/springroll/dist/modules/display-pixi.min.js",
51-
"mainDebug": "components/springroll/dist/modules/display-pixi.js",
94+
"description": "Display plugin which uses Pixi.js to render the canvas",
95+
"main": "components/springroll/dist/modules/pixi-display.min.js",
96+
"mainDebug": "components/springroll/dist/modules/pixi-display.js",
5297
"bower": {
5398
"pixi.js":"https://github.com/SpringRoll/pixi.js.git"
5499
},
55100
"libraries": "components/pixi.js/bin/pixi.js",
56101
"librariesDebug": "components/pixi.js/bin/pixi.dev.js",
57-
"depends": ["springroll.Core"],
102+
"depends": ["core"],
58103
"display": "springroll.pixi.PixiDisplay",
59104
"default": false
60105
},
61106
{
62-
"id": "springroll.NativeDisplay",
107+
"id": "pixi-animation",
108+
"name": "Pixi.js Animation",
109+
"description": "Manage animation playback with sprites or Spine animations",
110+
"main": "components/springroll/dist/modules/pixi-animation.min.js",
111+
"mainDebug": "components/springroll/dist/modules/pixi-animation.js",
112+
"depends": ["pixi-display"],
113+
"default": false
114+
},
115+
{
116+
"id": "pixi-interface",
117+
"name": "Pixi.js Interface",
118+
"description": "Drag management and basic buttons for Pixi.js",
119+
"main": "components/springroll/dist/modules/pixi-interface.min.js",
120+
"mainDebug": "components/springroll/dist/modules/pixi-interface.js",
121+
"depends": ["pixi-display"],
122+
"default": false
123+
},
124+
{
125+
"id": "native-display",
63126
"name": "Native Display",
64-
"main": "components/springroll/dist/modules/display-native.min.js",
65-
"mainDebug": "components/springroll/dist/modules/display-native.js",
66-
"depends": ["springroll.Core"],
127+
"description": "Display plugin which uses Context2d to render the canvas",
128+
"main": "components/springroll/dist/modules/native-display.min.js",
129+
"mainDebug": "components/springroll/dist/modules/native-display.js",
130+
"depends": ["core"],
67131
"display": "springroll.native.NativeDisplay",
68132
"default": false
69133
},
70134
{
71-
"id": "springroll.Tasks",
135+
"id": "debug",
136+
"name": "Debug",
137+
"description": "Feature parity with window.console but with support remote debugging and colored logs",
138+
"mainDebug": "components/springroll/dist/modules/debug.js",
139+
"depends": ["core"]
140+
},
141+
{
142+
"id": "tasks",
72143
"name": "Tasks",
144+
"description": "Manager for asynchronous tasks, like loading multiple assets",
73145
"main": "components/springroll/dist/modules/tasks.min.js",
74146
"mainDebug": "components/springroll/dist/modules/tasks.js",
75-
"depends": ["springroll.Core"]
147+
"depends": ["core"]
76148
},
77149
{
78-
"id": "springroll.Sound",
150+
"id": "sound",
79151
"name": "Sound",
152+
"description": "Middleware for SoundJS which support a simplified API and VOPlayer",
80153
"bower": {
81154
"soundjs": "https://github.com/SpringRoll/SoundJS.git"
82155
},
@@ -93,49 +166,121 @@
93166
"librariesCopy": {
94167
"components/soundjs/lib/FlashAudioPlugin.swf": "deploy/assets/swfs/"
95168
},
96-
"depends": ["springroll.Core"]
169+
"depends": ["core"]
97170
},
98171
{
99-
"id": "springroll.Interface",
172+
"id": "interface",
100173
"name": "Interface",
174+
"description": "Rendering of responive interfaces with UIScaler",
101175
"main": "components/springroll/dist/modules/interface.min.js",
102176
"mainDebug": "components/springroll/dist/modules/interface.js",
103177
"depends": [
104-
"springroll.Core",
105-
["springroll.CreateJSDisplay", "springroll.PixiDisplay"]
178+
"core",
179+
["easeljs-display", "pixi-display"]
106180
]
107181
},
108182
{
109-
"id": "springroll.Captions",
183+
"id": "captions",
110184
"name": "Captions",
185+
"description": "Playback of closed-captioning",
111186
"main": "components/springroll/dist/modules/captions.min.js",
112187
"mainDebug": "components/springroll/dist/modules/captions.js",
113-
"depends": ["springroll.Core"]
188+
"depends": ["core"]
114189
},
115190
{
116-
"id": "springroll.Game",
191+
"id": "game",
117192
"name": "Game",
193+
"description": "Special Application that supports automatic sound and captions integration",
118194
"main": "components/springroll/dist/modules/game.min.js",
119195
"mainDebug": "components/springroll/dist/modules/game.js",
120196
"depends": [
121-
"springroll.Sound",
122-
"springroll.Core",
123-
["springroll.CreateJSDisplay","springroll.PixiDisplay"]
197+
"sound",
198+
"core",
199+
["easeljs-display","pixi-display"]
124200
]
125201
},
126202
{
127-
"id": "springroll.Translate",
203+
"id": "translate",
128204
"name": "Translate",
205+
"description": "Simple language translation for dynamic asset loading based on locale",
129206
"main": "components/springroll/dist/modules/translate.min.js",
130207
"mainDebug": "components/springroll/dist/modules/translate.js",
131-
"depends": ["springroll.Core"]
208+
"depends": ["core"]
132209
},
133210
{
134-
"id": "springroll.Worker",
135-
"name": "Worker",
136-
"main": "components/springroll/dist/modules/worker.min.js",
137-
"mainDebug": "components/springroll/dist/modules/worker.js",
211+
"id": "progress-tracker",
212+
"name": "Progress Tracker",
213+
"description": "Integration for sending events with the Progress Tracker",
214+
"main": "components/springroll/dist/modules/progress-tracker.min.js",
215+
"mainDebug": [
216+
"components/springroll/dist/modules/progress-tracker.js",
217+
"components/springroll/dist/modules/progress-tracker.css"
218+
],
219+
"depends": ["core"]
220+
},
221+
{
222+
"id": "tracking-game",
223+
"name": "Tracking Game",
224+
"description": "Special game application which can use hinting or progress-tracker",
225+
"main": "components/springroll/dist/modules/tracking-game.min.js",
226+
"mainDebug": "components/springroll/dist/modules/tracking-game.js",
227+
"bower": {
228+
"bellhop": "*"
229+
},
230+
"libraries":[
231+
"components/bellhop/dist/bellhop.min.js"
232+
],
233+
"librariesDebug": [
234+
"components/bellhop/dist/bellhop.js"
235+
],
236+
"depends": [
237+
"game",
238+
"tasks",
239+
"interface"
240+
]
241+
},
242+
{
243+
"id": "easeljs-tracking-game",
244+
"name": "EaselJS Tracking Game",
245+
"description": "Special EaselJS flavor of the tracking game module",
246+
"main": "components/springroll/dist/modules/easeljs-tracking-game.min.js",
247+
"mainDebug": "components/springroll/dist/modules/easeljs-tracking-game.js",
248+
"depends": [
249+
"tracking-game",
250+
"easeljs-display"
251+
]
252+
},
253+
{
254+
"id": "hinting",
255+
"name": "Hinting",
256+
"description": "Management of hinting using either animation or VO playback",
257+
"main": "components/springroll/dist/modules/hinting.min.js",
258+
"mainDebug": "components/springroll/dist/modules/hinting.js",
259+
"depends": [
260+
"sound",
261+
["pixi-animation", "easeljs-animation"]
262+
]
263+
},
264+
{
265+
"id": "container",
266+
"name": "Tracking Game Container",
267+
"description": "The container for interacting with Tracking Games that are iframed",
268+
"main": "components/springroll/dist/modules/container.min.js",
269+
"mainDebug": "components/springroll/dist/modules/container.js",
270+
"bower": {
271+
"bellhop": "*",
272+
"jquery": "*"
273+
},
274+
"libraries":[
275+
"components/bellhop/dist/bellhop.min.js",
276+
"components/jquery/dist/jquery.min.js"
277+
],
278+
"librariesDebug": [
279+
"components/bellhop/dist/bellhop.js",
280+
"components/jquery/dist/jquery.js"
281+
],
282+
"depends": ["core"],
138283
"default": false
139284
}
140285
]
141-
}
286+
}

‎deploy/assets/templates/default/springroll.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"name": "_className_",
33
"displayName": "_name_",
44
"version": "_version_",
5+
"config": "src/_namespace_/config",
56
"main": [
67
"src/_namespace_/_className_.js",
78
"src/_namespace_/_className_.less"

0 commit comments

Comments
 (0)