fix loading for physics types
parent
80f747ac92
commit
1000de6f03
|
@ -101,12 +101,5 @@ GameLib.D3.Shape.prototype.toApiObject = function() {
|
|||
* @constructor
|
||||
*/
|
||||
GameLib.D3.Shape.FromObject = function(physics, objectShape) {
|
||||
|
||||
var apiShape = GameLib.D3.API.Shape.FromObject(objectShape);
|
||||
|
||||
return new GameLib.D3.Shape(
|
||||
physics,
|
||||
apiShape
|
||||
);
|
||||
|
||||
throw ('not implemented');
|
||||
};
|
||||
|
|
|
@ -22,6 +22,12 @@ GameLib.D3.Shape.Box = function (
|
|||
1,1,1
|
||||
)
|
||||
);
|
||||
} else if (halfExtents instanceof GameLib.API.Vector3) {
|
||||
halfExtents = new GameLib.Vector3(
|
||||
this.physics,
|
||||
halfExtents,
|
||||
this
|
||||
)
|
||||
}
|
||||
this.halfExtents = halfExtents;
|
||||
|
||||
|
@ -90,9 +96,9 @@ GameLib.D3.Shape.Box.prototype.setFromMesh = function() {
|
|||
|
||||
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;
|
||||
|
||||
return new GameLib.D3.Shape.Box(
|
||||
|
|
Loading…
Reference in New Issue