merge conflicts
commit
ede2c774e8
File diff suppressed because one or more lines are too long
|
@ -3245,88 +3245,9 @@ GameLib.D3.Scene.LoadSceneFromApi = function(
|
||||||
|
|
||||||
var physics3ds = [];
|
var physics3ds = [];
|
||||||
|
|
||||||
if (scene.physics && scene.physics.length > 0) {
|
if (scene.worlds && scene.worlds.length > 0) {
|
||||||
|
console.warn('Implement physics worlds code here');
|
||||||
for (var p = 0; p < scene.physics.length; p++) {
|
//TODO: physics world code here
|
||||||
|
|
||||||
var physics = scene.physics[p];
|
|
||||||
|
|
||||||
var engine = null;
|
|
||||||
|
|
||||||
if (physics.engine.engineType == GameLib.D3.Engine.ENGINE_TYPE_CANNON) {
|
|
||||||
engine = new GameLib.D3.Engine(
|
|
||||||
GameLib.D3.Engine.ENGINE_TYPE_CANNON,
|
|
||||||
CANNON
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
var physics3d = new GameLib.D3.Physics(
|
|
||||||
physics.id,
|
|
||||||
physics.name,
|
|
||||||
engine,
|
|
||||||
null
|
|
||||||
);
|
|
||||||
|
|
||||||
var worlds3d = [];
|
|
||||||
|
|
||||||
for (var w = 0; w < physics.worlds.length; w++) {
|
|
||||||
|
|
||||||
var world = physics.worlds[w];
|
|
||||||
|
|
||||||
var broadphase = world.broadphase;
|
|
||||||
|
|
||||||
var broadphase3d = new GameLib.D3.Physics.Broadphase(
|
|
||||||
broadphase.id,
|
|
||||||
broadphase.name,
|
|
||||||
broadphase.broadphaseType
|
|
||||||
);
|
|
||||||
|
|
||||||
var solver = world.solver;
|
|
||||||
|
|
||||||
var solver3d = new GameLib.D3.Physics.Solver(
|
|
||||||
solver.id,
|
|
||||||
solver.name,
|
|
||||||
solver.solverType,
|
|
||||||
solver.iterations,
|
|
||||||
solver.tolerance
|
|
||||||
);
|
|
||||||
|
|
||||||
var bodies = world.rigidBodies;
|
|
||||||
|
|
||||||
var bodies3d = [];
|
|
||||||
|
|
||||||
for (var b = 0; b < bodies.length; b++) {
|
|
||||||
|
|
||||||
var body = bodies[b];
|
|
||||||
|
|
||||||
//TODO: add all body properties here
|
|
||||||
var body3d = new GameLib.D3.Physics.RigidBody(
|
|
||||||
body.id,
|
|
||||||
body.name
|
|
||||||
);
|
|
||||||
|
|
||||||
bodies3d.push(body3d);
|
|
||||||
}
|
|
||||||
|
|
||||||
var world3d = new GameLib.D3.Physics.World(
|
|
||||||
null,
|
|
||||||
world.name,
|
|
||||||
physics3d,
|
|
||||||
new GameLib.D3.Vector3(
|
|
||||||
world.gravity.x,
|
|
||||||
world.gravity.y,
|
|
||||||
world.gravity.z
|
|
||||||
),
|
|
||||||
broadphase3d,
|
|
||||||
solver3d,
|
|
||||||
bodies3d
|
|
||||||
);
|
|
||||||
|
|
||||||
worlds3d.push(world3d);
|
|
||||||
}
|
|
||||||
|
|
||||||
physics3ds.push(physics3d);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var lights3d = [];
|
var lights3d = [];
|
||||||
|
@ -3413,7 +3334,7 @@ GameLib.D3.Scene.LoadSceneFromApi = function(
|
||||||
physics3ds
|
physics3ds
|
||||||
);
|
);
|
||||||
|
|
||||||
GameLib.D3.Scene.loadScene(
|
GameLib.D3.Scene.LoadScene(
|
||||||
scene3d,
|
scene3d,
|
||||||
onLoaded,
|
onLoaded,
|
||||||
false,
|
false,
|
||||||
|
@ -3437,7 +3358,7 @@ GameLib.D3.Scene.LoadSceneFromApi = function(
|
||||||
* @param uploadUrl
|
* @param uploadUrl
|
||||||
* @param progressCallback
|
* @param progressCallback
|
||||||
*/
|
*/
|
||||||
GameLib.D3.Scene.loadScene = function(
|
GameLib.D3.Scene.LoadScene = function(
|
||||||
gameLibScene,
|
gameLibScene,
|
||||||
onLoaded,
|
onLoaded,
|
||||||
computeNormals,
|
computeNormals,
|
||||||
|
|
|
@ -139,88 +139,9 @@ GameLib.D3.Scene.LoadSceneFromApi = function(
|
||||||
|
|
||||||
var physics3ds = [];
|
var physics3ds = [];
|
||||||
|
|
||||||
if (scene.physics && scene.physics.length > 0) {
|
if (scene.worlds && scene.worlds.length > 0) {
|
||||||
|
console.warn('Implement physics worlds code here');
|
||||||
for (var p = 0; p < scene.physics.length; p++) {
|
//TODO: physics world code here
|
||||||
|
|
||||||
var physics = scene.physics[p];
|
|
||||||
|
|
||||||
var engine = null;
|
|
||||||
|
|
||||||
if (physics.engine.engineType == GameLib.D3.Engine.ENGINE_TYPE_CANNON) {
|
|
||||||
engine = new GameLib.D3.Engine(
|
|
||||||
GameLib.D3.Engine.ENGINE_TYPE_CANNON,
|
|
||||||
CANNON
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
var physics3d = new GameLib.D3.Physics(
|
|
||||||
physics.id,
|
|
||||||
physics.name,
|
|
||||||
engine,
|
|
||||||
null
|
|
||||||
);
|
|
||||||
|
|
||||||
var worlds3d = [];
|
|
||||||
|
|
||||||
for (var w = 0; w < physics.worlds.length; w++) {
|
|
||||||
|
|
||||||
var world = physics.worlds[w];
|
|
||||||
|
|
||||||
var broadphase = world.broadphase;
|
|
||||||
|
|
||||||
var broadphase3d = new GameLib.D3.Physics.Broadphase(
|
|
||||||
broadphase.id,
|
|
||||||
broadphase.name,
|
|
||||||
broadphase.broadphaseType
|
|
||||||
);
|
|
||||||
|
|
||||||
var solver = world.solver;
|
|
||||||
|
|
||||||
var solver3d = new GameLib.D3.Physics.Solver(
|
|
||||||
solver.id,
|
|
||||||
solver.name,
|
|
||||||
solver.solverType,
|
|
||||||
solver.iterations,
|
|
||||||
solver.tolerance
|
|
||||||
);
|
|
||||||
|
|
||||||
var bodies = world.rigidBodies;
|
|
||||||
|
|
||||||
var bodies3d = [];
|
|
||||||
|
|
||||||
for (var b = 0; b < bodies.length; b++) {
|
|
||||||
|
|
||||||
var body = bodies[b];
|
|
||||||
|
|
||||||
//TODO: add all body properties here
|
|
||||||
var body3d = new GameLib.D3.Physics.RigidBody(
|
|
||||||
body.id,
|
|
||||||
body.name
|
|
||||||
);
|
|
||||||
|
|
||||||
bodies3d.push(body3d);
|
|
||||||
}
|
|
||||||
|
|
||||||
var world3d = new GameLib.D3.Physics.World(
|
|
||||||
null,
|
|
||||||
world.name,
|
|
||||||
physics3d,
|
|
||||||
new GameLib.D3.Vector3(
|
|
||||||
world.gravity.x,
|
|
||||||
world.gravity.y,
|
|
||||||
world.gravity.z
|
|
||||||
),
|
|
||||||
broadphase3d,
|
|
||||||
solver3d,
|
|
||||||
bodies3d
|
|
||||||
);
|
|
||||||
|
|
||||||
worlds3d.push(world3d);
|
|
||||||
}
|
|
||||||
|
|
||||||
physics3ds.push(physics3d);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var lights3d = [];
|
var lights3d = [];
|
||||||
|
@ -307,7 +228,7 @@ GameLib.D3.Scene.LoadSceneFromApi = function(
|
||||||
physics3ds
|
physics3ds
|
||||||
);
|
);
|
||||||
|
|
||||||
GameLib.D3.Scene.loadScene(
|
GameLib.D3.Scene.LoadScene(
|
||||||
scene3d,
|
scene3d,
|
||||||
onLoaded,
|
onLoaded,
|
||||||
false,
|
false,
|
||||||
|
@ -331,7 +252,7 @@ GameLib.D3.Scene.LoadSceneFromApi = function(
|
||||||
* @param uploadUrl
|
* @param uploadUrl
|
||||||
* @param progressCallback
|
* @param progressCallback
|
||||||
*/
|
*/
|
||||||
GameLib.D3.Scene.loadScene = function(
|
GameLib.D3.Scene.LoadScene = function(
|
||||||
gameLibScene,
|
gameLibScene,
|
||||||
onLoaded,
|
onLoaded,
|
||||||
computeNormals,
|
computeNormals,
|
||||||
|
|
Loading…
Reference in New Issue