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

fix loading for physics types

beta.r3js.org
Theunis J. Botha 2017-06-30 14:35:51 +02:00
parent 80f747ac92
commit 1000de6f03
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/game-lib-d3-shape-0.js
View File

@ -101,12 +101,5 @@ GameLib.D3.Shape.prototype.toApiObject = function() {
* @constructor * @constructor
*/ */
GameLib.D3.Shape.FromObject = function(physics, objectShape) { GameLib.D3.Shape.FromObject = function(physics, objectShape) {
throw ('not implemented');
var apiShape = GameLib.D3.API.Shape.FromObject(objectShape);
return new GameLib.D3.Shape(
physics,
apiShape
);
}; };

10
src/game-lib-d3-shape-box.js
View File

@ -22,6 +22,12 @@ GameLib.D3.Shape.Box = function (
1,1,1 1,1,1
) )
); );
} else if (halfExtents instanceof GameLib.API.Vector3) {
halfExtents = new GameLib.Vector3(
this.physics,
halfExtents,
this
)
} }
this.halfExtents = halfExtents; this.halfExtents = halfExtents;
@ -90,9 +96,9 @@ GameLib.D3.Shape.Box.prototype.setFromMesh = function() {
GameLib.D3.Shape.Box.FromObject = function(physics, objectShape) { GameLib.D3.Shape.Box.FromObject = function(physics, objectShape) {
var apiShape = GameLib.D3.Shape.FromObject(physics, objectShape); var apiShape = GameLib.D3.API.Shape.FromObject(objectShape);
apiShape.halfExtents = objectShape.halfExtents; apiShape.halfExtents = GameLib.API.Vector3.FromObject(objectShape.halfExtents);
apiShape.activeMesh = objectShape.activeMesh; apiShape.activeMesh = objectShape.activeMesh;
return new GameLib.D3.Shape.Box( return new GameLib.D3.Shape.Box(