Merge branch 'master' of bitbucket.org:cybafelo/r3
commit
eb9403d491
|
@ -61,7 +61,7 @@ GameLib.D3.RigidBody = function(
|
||||||
this.engine.isNotCannonThrow();
|
this.engine.isNotCannonThrow();
|
||||||
this.instance = this.createInstance();
|
this.instance = this.createInstance();
|
||||||
|
|
||||||
// Todo: this should be executed somewhere in game-lib-z, so that we don't execute it on every construction of an object.
|
// Todo: this should be executed somewhere in r3-z, so that we don't execute it on every construction of an object.
|
||||||
GameLib.Utils.Extend(GameLib.D3.RigidBody, GameLib.Component);
|
GameLib.Utils.Extend(GameLib.D3.RigidBody, GameLib.Component);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
14
gulpfile.js
14
gulpfile.js
|
@ -19,9 +19,9 @@ gulp.task(
|
||||||
console.log("Compiling start at", __DATE__);
|
console.log("Compiling start at", __DATE__);
|
||||||
|
|
||||||
var __EXTENDS__ = "";
|
var __EXTENDS__ = "";
|
||||||
return gulp.src('./src/game-lib-*.js')
|
return gulp.src('./src/r3-*.js')
|
||||||
.pipe(sort())
|
.pipe(sort())
|
||||||
.pipe(concat('game-lib.js'))
|
.pipe(concat('r3.js'))
|
||||||
.pipe(
|
.pipe(
|
||||||
inject.prepend(
|
inject.prepend(
|
||||||
"// COMPILE TIME DEFINITIONS (Generated via gulp) \n" +
|
"// COMPILE TIME DEFINITIONS (Generated via gulp) \n" +
|
||||||
|
@ -58,7 +58,7 @@ gulp.task(
|
||||||
);
|
);
|
||||||
|
|
||||||
gulp.task('test-prepare', function(){
|
gulp.task('test-prepare', function(){
|
||||||
return gulp.src('./build/game-lib.js')
|
return gulp.src('./build/r3.js')
|
||||||
.pipe(plumber())
|
.pipe(plumber())
|
||||||
.pipe(istanbul())
|
.pipe(istanbul())
|
||||||
.pipe(istanbul.hookRequire())
|
.pipe(istanbul.hookRequire())
|
||||||
|
@ -95,8 +95,8 @@ gulp.task(
|
||||||
|
|
||||||
gulp.task('compileRuntime', ['merge'],
|
gulp.task('compileRuntime', ['merge'],
|
||||||
function() {
|
function() {
|
||||||
gulp.src(['./defines/runtime.js', './build/game-lib.js'])
|
gulp.src(['./defines/runtime.js', './build/r3.js'])
|
||||||
.pipe(concat('game-lib-runtime.js'))
|
.pipe(concat('r3-runtime.js'))
|
||||||
.pipe(preprocessor(
|
.pipe(preprocessor(
|
||||||
{
|
{
|
||||||
// End of line character
|
// End of line character
|
||||||
|
@ -134,8 +134,8 @@ gulp.task('compileRuntime', ['merge'],
|
||||||
|
|
||||||
gulp.task('compileEditor', ['merge'],
|
gulp.task('compileEditor', ['merge'],
|
||||||
function() {
|
function() {
|
||||||
gulp.src(['./defines/editor.js', './build/game-lib.js'])
|
gulp.src(['./defines/editor.js', './build/r3.js'])
|
||||||
.pipe(concat('game-lib-editor.js'))
|
.pipe(concat('r3-editor.js'))
|
||||||
.pipe(preprocessor(
|
.pipe(preprocessor(
|
||||||
{
|
{
|
||||||
// End of line character
|
// End of line character
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"name": "spoon-game-lib",
|
"name": "spoon-r3",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
{
|
{
|
||||||
"name": "spoon-game-lib",
|
"name": "spoon-r3",
|
||||||
"description": "Flying Spoon Game Library",
|
"description": "Flying Spoon Game Library",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"repository": "https://bitbucket.org/flyingspoon/editor-game-lib.git",
|
"repository": "https://bitbucket.org/flyingspoon/editor-r3.git",
|
||||||
"license": "UNLICENSED",
|
"license": "UNLICENSED",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"cannon": "^0.6.2",
|
"cannon": "^0.6.2",
|
||||||
|
|
|
@ -37,7 +37,7 @@ R3.GraphicsRuntime.Impact.prototype.createInstance = function() {
|
||||||
this.instance = ig;
|
this.instance = ig;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* We override the game load to lookup the canvas from our game-lib and not the DOM, since our canvas
|
* We override the game load to lookup the canvas from our r3 and not the DOM, since our canvas
|
||||||
* does not necessarily live inside the DOM
|
* does not necessarily live inside the DOM
|
||||||
*/
|
*/
|
||||||
ig.System.inject({
|
ig.System.inject({
|
||||||
|
|
|
@ -3,7 +3,7 @@ var chai = require('chai'),
|
||||||
sinonChai = require("sinon-chai"),
|
sinonChai = require("sinon-chai"),
|
||||||
config = require('../config.js'),
|
config = require('../config.js'),
|
||||||
assert = chai.assert,
|
assert = chai.assert,
|
||||||
GameLib = require('../build/game-lib'),
|
GameLib = require('../build/r3'),
|
||||||
CANNON = require('cannon'),
|
CANNON = require('cannon'),
|
||||||
THREE = require('three');
|
THREE = require('three');
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue