Start on new Entity system with kittenbox

Joe Dytrych · Joe Dytrych · commit 1756db6333a1 · 2015-07-22T14:18:54.000+01:00
diff --git a/app/assets/common/bundle.json b/app/assets/common/bundle.json
@@ -2,5 +2,6 @@
   "/audio/effects/*",
   "/content/common/**/*.*",
   "/content/particles/*",
-  "/content/sprites/*"
+  "/content/sprites/*",
+  "/entities/kitten-box/**/*.*"
 ]
diff --git a/app/entities/kitten-box/KittenBox.ls b/app/entities/kitten-box/KittenBox.ls
@@ -16,19 +16,19 @@ random-kitten-el = ->
     ..add-class 'kitten-anim'
 
 box-burst-sprite = (av, x, y) ->
-  sprite = new SpriteSheet '/content/sprites/kitten-box-burst', 48, 52, x - 24, y - 26, {
+  sprite = new SpriteSheet '/entities/kitten-box/sprites/kitten-box-burst', 48, 52, x - 24, y - 26, {
     speed: 30
     loop-times: 1
     state: \paused
   }
 
 blink-sprite = (av, x, y) ->
-  sprite = new SpriteSheet '/content/sprites/kitten-box-blink', 48, 52, x - 24, y - 26, {
+  sprite = new SpriteSheet '/entities/kitten-box/sprites/kitten-box-blink', 48, 52, x - 24, y - 26, {
     speed: 30
     delay: [0.1, 6]
   }
 
-module.exports = class KittenBox extends Actor
+class KittenBox extends Actor
   @from-el = ($el, [x, y, kitten-id], offset = {x: 0, y: 0}, save-level, area-view) ->
     new KittenBox {
       x: offset.x + parse-float x
@@ -103,3 +103,5 @@ module.exports = class KittenBox extends Actor
       @$el
         ..empty!
         ..remove!
+
+eak.register-actor KittenBox
diff --git a/app/entities/kitten-box/sprites/kitten-box-blink.json b/app/entities/kitten-box/sprites/kitten-box-blink.json
diff --git a/app/entities/kitten-box/sprites/kitten-box-blink.png b/app/entities/kitten-box/sprites/kitten-box-blink.png
diff --git a/app/entities/kitten-box/sprites/kitten-box-burst.json b/app/entities/kitten-box/sprites/kitten-box-burst.json
diff --git a/app/entities/kitten-box/sprites/kitten-box-burst.png b/app/entities/kitten-box/sprites/kitten-box-burst.png
diff --git a/app/scripts/App.ls b/app/scripts/App.ls
@@ -6,6 +6,7 @@ require! {
   'game/event-loop'
   'game/load'
   'game/pauser'
+  'game/actors'
   'lib/channels'
   'lib/parse'
   'loader/LoaderView'
@@ -82,6 +83,9 @@ module.exports = class App
     @start-state-machine!
     @on 'transition' (leave, enter) -> console.log "[transition] #leave -> #enter"
 
+    # Expose stuff:
+    @register-actor = actors.register-actor
+
     Promise
       .all [
         assets.load-bundle 'common' .then -> effects.load!
diff --git a/app/scripts/assets.ls b/app/scripts/assets.ls
@@ -33,6 +33,7 @@ export function load-bundle name, progress
     .then (bundle) ->
       for name, file of bundle
         asset-cache[name] = debundle file
+        if name.match /\.js$/ then add-js asset-cache[name].default
 
 export function debundle file
   if typeof file is \string then file = data: file, type: \string
@@ -57,3 +58,6 @@ export function debundle file
       default: url, url: url, buffer: data.buffer, image: tag
     default
       throw new TypeError "Unknown file type #{file.type}"
+
+function add-js js
+  eval js
diff --git a/app/scripts/game/actors/index.ls b/app/scripts/game/actors/index.ls
@@ -15,3 +15,8 @@ module.exports.from-el = (el, offset, level-store, area-view) ->
   a = actors[actor].from-el $el, args, offset, level-store, area-view
   $el.data 'actor', a
   a
+
+module.exports.register-actor = (ctor) ->
+  name = dasherize ctor.display-name
+  console.log "[actors] Registered actor #name"
+  actors[name] = ctor
diff --git a/app/scripts/user/Game.ls b/app/scripts/user/Game.ls
@@ -91,7 +91,7 @@ module.exports = class Game extends Backbone.DeepModel
       'game.state.kittenCount': 1 + (@get \game.state.kittenCount or 0)
     }, silent: true
 
-    @store.levels.save-kitten @id, level-id, kitten
+    @store.levels.save-kitten @id, level-id, kitten: kitten
 
   patch-stage-state: (patch, value) ->
     if typeof patch is \string then patch = {"#patch": value}
diff --git a/gulpfile.ls b/gulpfile.ls
@@ -41,9 +41,11 @@ global.src = {
   bundles: './public/**/bundle.json'
   css-all: './app/styles/**/*.styl'
   css: ['./app/styles/app.styl', './app/styles/min.styl']
+  entity-assets: './app/entities/**/*.{png,jpg,gif,json}'
+  entity-scripts: './app/entities/**/*.ls'
   fonts: './bower_components/font-awesome/fonts/*'
   hbs: './app/scripts/**/*.hbs'
-  images: './app/assets/**/*.{jpg,png,gif}'
+  images: './app/**/*.{jpg,png,gif}'
   locale-data: './locales/**/*.json'
   locale-templates: './app/l10n-templates/**/*'
   lsc: './app/scripts/**/*.ls'
@@ -68,6 +70,7 @@ global.dest = {
   cache: './gulp-cache/'
   css: './public/css'
   data: './public/data'
+  entities: './public/entities'
   fonts: './public/fonts'
   images: './app/assets'
   js: './public/js'
diff --git a/karma.conf.js b/karma.conf.js
@@ -16,7 +16,7 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       'public/js/vendor.js',
-      'public/**/*.js',
+      'public/js/**/*.js',
       '.test/test-helper.js',
       '.test/**/*.js'
     ],
diff --git a/tasks/assets.ls b/tasks/assets.ls
@@ -22,6 +22,11 @@ gulp.task 'assets' <[backgrounds]> ->
     .pipe gulp-changed dest.assets
     .pipe gulp.dest './public'
 
+gulp.task 'entity-assets' ->
+  gulp.src src.entity-assets
+    .pipe gulp-changed dest.assets
+    .pipe gulp.dest dest.entities
+
 gulp.task 'fonts' ->
   gulp.src src.fonts
     .pipe gulp-changed dest.fonts
diff --git a/tasks/dev.ls b/tasks/dev.ls
@@ -11,16 +11,19 @@ karma-config = path.resolve 'karma.conf.js'
 
 gulp.task 'build' (done) ->
   scripts = if optimized then \optimized-scripts else \scripts
-  run-sequence 'clean', [scripts, \assets \stylus \vendor \audio \fonts], \l10n, \pack, done
+  run-sequence 'clean', [scripts, \assets \entity-assets \stylus \vendor \audio \fonts], \l10n, \pack, done
 
 gulp.task 'dev' ->
   run-sequence 'build', <[watch server]>
 
 karma-server = null
 gulp.task 'watch' ->
   karma.server.start config-file: karma-config
+  gulp.watch
   gulp.watch src.assets, ['assets']
+  gulp.watch src.entity-assets, ['entity-assets']
   gulp.watch src.lsc, ['app-livescript']
+  gulp.watch src.entity-scripts, ['entity-livescript']
   gulp.watch src.tests, ['test-livescript']
   gulp.watch src.hbs, ['handlebars']
   gulp.watch src.css-all, ['stylus']
diff --git a/tasks/scripts.ls b/tasks/scripts.ls
@@ -31,22 +31,31 @@ gulp.task 'optimized-scripts' ['scripts'] ->
     .pipe gulp.dest dest.js
 
 gulp.task 'livescript' (done) ->
-  run-sequence ['app-livescript', 'test-livescript'], done
+  run-sequence ['app-livescript', 'entity-livescript' 'test-livescript'], done
 
 gulp.task 'app-livescript' ->
   gulp.src src.lsc
     .pipe gulp-changed dest.js, extension: '.js'
     .pipe gulp-sourcemaps.init!
     .pipe gulp-livescript!
+    .on 'error' -> throw it
     .pipe gulp-wrap-js wrap-js-template, {
       indent:
         style: '  '
         adjust-multiline-comment: true
     }
     .pipe gulp-sourcemaps.write 'sourcemaps', source-root: '/js'
-    .on 'error' -> throw it
     .pipe gulp.dest dest.js
 
+gulp.task 'entity-livescript' ->
+  gulp.src src.entity-scripts
+    .pipe gulp-changed dest.js, extension: '.js'
+    .pipe gulp-sourcemaps.init!
+    .pipe gulp-livescript!
+    .on 'error' -> throw it
+    .pipe gulp-sourcemaps.write 'sourcemaps', source-root: '/entities'
+    .pipe gulp.dest dest.entities
+
 gulp.task 'test-livescript' ->
   gulp.src src.tests
     .pipe gulp-changed dest.tests, extension: '.js'

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,6 @@`
`2`	`2`	`"/audio/effects/*",`
`3`	`3`	`"/content/common/*/.*",`
`4`	`4`	`"/content/particles/*",`
`5`		`- "/content/sprites/*"`
	`5`	`+ "/content/sprites/*",`
	`6`	`+ "/entities/kitten-box/*/.*"`
`6`	`7`	`]`
Original file line number	Diff line number	Diff line change
`@@ -15,3 +15,8 @@ module.exports.from-el = (el, offset, level-store, area-view) ->`
`15`	`15`	`a = actors[actor].from-el $el, args, offset, level-store, area-view`
`16`	`16`	`$el.data 'actor', a`
`17`	`17`	`a`
	`18`	`+`
	`19`	`+module.exports.register-actor = (ctor) ->`
	`20`	`+ name = dasherize ctor.display-name`
	`21`	`+ console.log "[actors] Registered actor #name"`
	`22`	`+ actors[name] = ctor`