Skip to content
Permalink
Browse files

Changed Math.js to be required in gladius-src.js rather than just bei…

…ng added as a script in gladius.js. Allows Math to be a function of the engine rather than an added script.
  • Loading branch information...
root
root committed Sep 30, 2011
1 parent 6b217b1 commit c0003d00b913e7b71ea407a88943a339007e6bb1
Showing with 7 additions and 2 deletions.
  1. +4 −1 src/common/Math.js
  2. +1 −0 src/gladius-src.js
  3. +2 −1 src/gladius.js
@@ -2,6 +2,7 @@
nomen: false */
/*global define: false, console: false, window: false, setTimeout: false */

define( function(require){
var _Math = function( options ) {

var that = this;
@@ -548,4 +549,6 @@ var _Math = function( options ) {

}

window.math = new _Math();
//window.math = new _Math();
return _Math;
});
@@ -7,6 +7,7 @@ define( function ( require ) {
Component = require( './core/Component' ),
Scene = require( './core/Scene' ),
Transform = require( './core/component/Transform' ),
Math = require( './common/Math' ),

Paladin, i, args,

@@ -40,7 +40,8 @@
'} );' +
'requirejs(["gladius-src"])</' + 'script>');

document.write( '<script src="' + path + 'common/Math.js"></' + 'script>' );
// document.write( '<script src="' + path + 'common/Math.js"></' + 'script>' );

}

var gladius = this.gladius || ( this.gladius = {} );

0 comments on commit c0003d0

Please sign in to comment.
You can’t perform that action at this time.