Start of the game, started with tiled sidecroller

130e83de · Richard Torenvliet · 7f3edf1e · 130e83de · 130e83de · 130e83de
Commit 130e83de authored Mar 08, 2015 by Richard Torenvliet
14 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,4 @@ CONTRIBUTING.md
 LICENSE
 changelog.tpl
 tools.md
-
-
+*.DS_Store
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -18,11 +18,42 @@ module.exports = function ( grunt ) {
  grunt.loadNpmTasks('grunt-ng-annotate');
  grunt.loadNpmTasks('grunt-html2js');

+  grunt.loadNpmTasks('grunt-http-server');
  /**
   * Load in our build configuration file.
   */
  var userConfig = require( './build.config.js' );

+
+  var httpConfig = {
+    'http-server': {
+      'dev': {
+
+          // the server root directory
+          root: 'build/',
+
+          // the server port
+          // can also be written as a function, e.g.
+          // port: function() { return 8282; }
+          port: 8282,
+
+          // the host ip address
+          // If specified to, for example, "127.0.0.1" the server will
+          // only be available on that ip.
+          // Specify "0.0.0.0" to be available everywhere
+          host: "127.0.0.1",
+          showDir : true,
+          autoIndex: true,
+
+          // server default file extension
+          ext: "html",
+
+          // run in parallel with other tasks
+          runInBackground: false
+      }
+    }
+};
+
  /**
   * This is the configuration object Grunt uses to give each plugin its 
   * instructions.
@@ -546,7 +577,7 @@ module.exports = function ( grunt ) {
    }
  };

-  grunt.initConfig( grunt.util._.extend( taskConfig, userConfig ) );
+  grunt.initConfig( grunt.util._.extend( taskConfig, userConfig, httpConfig ) );

  /**
   * In order to make it safe to just compile or copy *only* what was changed,
@@ -634,7 +665,7 @@ module.exports = function ( grunt ) {
   */
  grunt.registerMultiTask( 'karmaconfig', 'Process karma config templates', function () {
    var jsFiles = filterForJS( this.filesSrc );
-    
+
    grunt.file.copy( 'karma/karma-unit.tpl.js', grunt.config( 'build_dir' ) + '/karma-unit.js', { 
      process: function ( contents, path ) {
        return grunt.template.process( contents, {

--- a/build.config.js
+++ b/build.config.js
@@ -22,7 +22,7 @@ module.exports = {
  app_files: {
    js: [ 'src/**/*.js', '!src/**/*.spec.js', '!src/assets/**/*.js' ],
    jsunit: [ 'src/**/*.spec.js' ],
-    
+
    coffee: [ 'src/**/*.coffee', '!src/**/*.spec.coffee' ],
    coffeeunit: [ 'src/**/*.spec.coffee' ],

@@ -66,7 +66,8 @@ module.exports = {
      'vendor/angular-bootstrap/ui-bootstrap-tpls.min.js',
      'vendor/placeholders/angular-placeholders-0.0.1-SNAPSHOT.min.js',
      'vendor/angular-ui-router/release/angular-ui-router.js',
-      'vendor/angular-ui-utils/modules/route/route.js'
+      'vendor/angular-ui-utils/modules/route/route.js',
+      'vendor/pixi.js/bin/pixi.dev.js'
    ],
    css: [
    ],

--- a/makefile
+++ b/makefile
+run:
+	grunt http-server:dev
--- a/package.json
+++ b/package.json
@@ -17,11 +17,12 @@
    "grunt-contrib-watch": "^0.4.4",
    "grunt-conventional-changelog": "^0.1.2",
    "grunt-html2js": "^0.1.9",
+    "grunt-http-server": "^1.2.0",
    "grunt-karma": "^0.8.2",
    "grunt-ng-annotate": "^0.8.0",
    "karma": "^0.12.9",
    "karma-coffee-preprocessor": "^0.2.1",
    "karma-firefox-launcher": "^0.1.3",
-    "karma-jasmine": "^0.1.5",
+    "karma-jasmine": "^0.1.5"
  }
 }
--- a/src/app/app.js
+++ b/src/app/app.js
@@ -2,6 +2,7 @@ angular.module( 'Interactive', [
    'templates-app',
    'templates-common',
    'Interactive.index',
+    'Interactive.pixi',
    'ui.router'
 ])


--- a/src/app/index/index.js
+++ b/src/app/index/index.js
 angular.module('Interactive.index', [
+    'Interactive.pixi',
    'ui.router'
 ])

@@ -20,5 +21,3 @@ angular.module('Interactive.index', [
 })

 ;
-
-
--- a/src/app/index/index.tpl.html
+++ b/src/app/index/index.tpl.html
-<div>
-    <h1>Index</h1>
-</div>
+<h1>Game</h1>
+<canvas pixi="stage" pixi-render="pixiRender"
+        pixi-transparent="false" width="900" height="400">
+</canvas>
--- a/src/assets/bunny.png
+++ b/src/assets/bunny.png
--- a/src/assets/images/mario_bg.png
+++ b/src/assets/images/mario_bg.png
--- a/src/assets/images/sky-blue-background.jpg
+++ b/src/assets/images/sky-blue-background.jpg
--- a/src/assets/images/ultraviolet-fractal-seamless-background.jpg
+++ b/src/assets/images/ultraviolet-fractal-seamless-background.jpg
--- a/src/assets/sprites.json
+++ b/src/assets/sprites.json
--- a/src/index.html
+++ b/src/index.html
@@ -15,7 +15,6 @@
  </head>
  <body>
      <div class="container" ui-view="main">
-          <h1>Test</h1>
      </div>
  </body>
 </html>