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

merge conflicts

beta.r3js.org
Theunis J. Botha 2016-11-01 16:24:29 +01:00
parent eb38cbe27c 74098b062d
commit 4d38ef3c0b
3 changed files with 61 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

89
build/game-lib.js
View File

@ -3057,88 +3057,9 @@ GameLib.D3.Scene.LoadSceneFromApi = function(
var physics3ds = [];
if (scene.physics && scene.physics.length > 0) {
for (var p = 0; p < scene.physics.length; p++) {
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);
}
if (scene.worlds && scene.worlds.length > 0) {
console.warn('Implement physics worlds code here');
//TODO: physics world code here
}
var lights3d = [];
@ -3225,7 +3146,7 @@ GameLib.D3.Scene.LoadSceneFromApi = function(
physics3ds
);
GameLib.D3.Scene.loadScene(
GameLib.D3.Scene.LoadScene(
scene3d,
onLoaded,
false,
@ -3249,7 +3170,7 @@ GameLib.D3.Scene.LoadSceneFromApi = function(
* @param uploadUrl
* @param progressCallback
*/
GameLib.D3.Scene.loadScene = function(
GameLib.D3.Scene.LoadScene = function(
gameLibScene,
onLoaded,
computeNormals,

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

@ -128,92 +128,14 @@ GameLib.D3.Scene.LoadSceneFromApi = function(
var physics3ds = [];
if (scene.physics && scene.physics.length > 0) {
for (var p = 0; p < scene.physics.length; p++) {
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);
}
if (scene.worlds && scene.worlds.length > 0) {
console.warn('Implement physics worlds code here');
//TODO: physics world code here
}
var lights3d = [];
if (scene.lights && scene.lights.length > 0) {
for (var l = 0; l < scene.lights.length; l++) {
var light = scene.lights[l];
@ -264,6 +186,7 @@ GameLib.D3.Scene.LoadSceneFromApi = function(
lights3d.push(light3d);
}
}
var scene3d = new GameLib.D3.Scene(
scene._id || scene.id,
@ -296,7 +219,7 @@ GameLib.D3.Scene.LoadSceneFromApi = function(
physics3ds
);
GameLib.D3.Scene.loadScene(
GameLib.D3.Scene.LoadScene(
scene3d,
onLoaded,
false,
@ -320,7 +243,7 @@ GameLib.D3.Scene.LoadSceneFromApi = function(
* @param uploadUrl
* @param progressCallback
*/
GameLib.D3.Scene.loadScene = function(
GameLib.D3.Scene.LoadScene = function(
gameLibScene,
onLoaded,
computeNormals,