cybafelo
/
r3-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

integration test fixes

beta.r3js.org
Theunis J. Botha 2016-10-27 18:47:02 +02:00
parent 7e8e3155bd
commit b071ae9d07
4 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/game-lib-min.js vendored
View File

File diff suppressed because one or more lines are too long

20
build/game-lib.js
View File

@ -2473,20 +2473,22 @@ GameLib.D3.RigidBody = function(
* *
* @returns {*} * @returns {*}
*/ */
GameLib.D3.RigidBody.prototype.createRigidBodyInstance = function() { GameLib.D3.RigidBody.prototype.createRigidBodyInstance = function(
engine
) {
var rigidBody = null; var rigidBody = null;
// Create the bodyObject // Create the bodyObject
if(this.physics.engineType == GameLib.D3.Physics.TYPE_CANNON) { if(engine.engineType == GameLib.D3.Engine.ENGINE_TYPE_CANNON) {
rigidBody = new this.physics.CANNON.Body( rigidBody = new engine.instance.Body(
{ {
mass: mass, mass: mass,
friction: friction, friction: friction,
position: new this.physics.CANNON.Vec3(position.x, position.y, position.z), position: new engine.instance.Vec3(position.x, position.y, position.z),
velocity: new this.physics.CANNON.Vec3(velocity.x, velocity.y, velocity.z), velocity: new engine.instance.Vec3(velocity.x, velocity.y, velocity.z),
quaternion: new this.physics.CANNON.Quaternion(quaternion.x, quaternion.y, quaternion.z, quaternion.w), quaternion: new engine.instance.Quaternion(quaternion.x, quaternion.y, quaternion.z, quaternion.w),
angularVelocity: new this.physics.CANNON.Vec3(angularVelocity.x, angularVelocity.y, angularVelocity.z), angularVelocity: new engine.instance.Vec3(angularVelocity.x, angularVelocity.y, angularVelocity.z),
linearDamping: linearDamping, linearDamping: linearDamping,
angularDamping: angularDamping, angularDamping: angularDamping,
allowSleep: allowSleep, allowSleep: allowSleep,
@ -2539,6 +2541,10 @@ GameLib.D3.Scene = function(
if (this.name.trim() == "") { if (this.name.trim() == "") {
this.name = 'unnamed'; this.name = 'unnamed';
} }
if (typeof meshes == 'undefined') {
meshes = [];
}
this.meshes = meshes; this.meshes = meshes;
if (typeof quaternion == 'undefined') { if (typeof quaternion == 'undefined') {

16
src/game-lib-rigid-body.js
View File

@ -59,20 +59,22 @@ GameLib.D3.RigidBody = function(
* *
* @returns {*} * @returns {*}
*/ */
GameLib.D3.RigidBody.prototype.createRigidBodyInstance = function() { GameLib.D3.RigidBody.prototype.createRigidBodyInstance = function(
engine
) {
var rigidBody = null; var rigidBody = null;
// Create the bodyObject // Create the bodyObject
if(this.physics.engineType == GameLib.D3.Physics.TYPE_CANNON) { if(engine.engineType == GameLib.D3.Engine.ENGINE_TYPE_CANNON) {
rigidBody = new this.physics.CANNON.Body( rigidBody = new engine.instance.Body(
{ {
mass: mass, mass: mass,
friction: friction, friction: friction,
position: new this.physics.CANNON.Vec3(position.x, position.y, position.z), position: new engine.instance.Vec3(position.x, position.y, position.z),
velocity: new this.physics.CANNON.Vec3(velocity.x, velocity.y, velocity.z), velocity: new engine.instance.Vec3(velocity.x, velocity.y, velocity.z),
quaternion: new this.physics.CANNON.Quaternion(quaternion.x, quaternion.y, quaternion.z, quaternion.w), quaternion: new engine.instance.Quaternion(quaternion.x, quaternion.y, quaternion.z, quaternion.w),
angularVelocity: new this.physics.CANNON.Vec3(angularVelocity.x, angularVelocity.y, angularVelocity.z), angularVelocity: new engine.instance.Vec3(angularVelocity.x, angularVelocity.y, angularVelocity.z),
linearDamping: linearDamping, linearDamping: linearDamping,
angularDamping: angularDamping, angularDamping: angularDamping,
allowSleep: allowSleep, allowSleep: allowSleep,

4
src/game-lib-scene.js
View File

@ -32,6 +32,10 @@ GameLib.D3.Scene = function(
if (this.name.trim() == "") { if (this.name.trim() == "") {
this.name = 'unnamed'; this.name = 'unnamed';
} }
if (typeof meshes == 'undefined') {
meshes = [];
}
this.meshes = meshes; this.meshes = meshes;
if (typeof quaternion == 'undefined') { if (typeof quaternion == 'undefined') {