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

loading first components from db

beta.r3js.org
Theunis J. Botha 2017-06-14 14:21:57 +02:00
parent d174999cf9
commit e4ec592a0b
65 changed files with 240 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/game-lib-a-api-component.js
View File

@ -26,43 +26,43 @@ GameLib.API.Component.prototype.constructor = GameLib.API.Component;
* @returns {GameLib.API.Component}
* @constructor
*/
GameLib.API.Component.FromObjectComponent = function(objectComponent) {
GameLib.API.Component.FromObject = function(objectComponent) {
if (objectComponent instanceof Object) {
if (objectComponent.componentType == GameLib.Component.COMPONENT_PATH_FOLLOWING) {
return GameLib.D3.API.PathFollowing.FromObjectComponent(objectComponent);
return GameLib.D3.API.PathFollowing.FromObject(objectComponent);
}
if (objectComponent.componentType === GameLib.Component.COMPONENT_RENDERER) {
return GameLib.D3.API.Renderer.FromObjectComponent(objectComponent);
return GameLib.D3.API.Renderer.FromObject(objectComponent);
}
if (objectComponent.componentType === GameLib.Component.COMPONENT_COMPOSER) {
return GameLib.D3.API.Composer.FromObjectComponent(objectComponent);
return GameLib.D3.API.Composer.FromObject(objectComponent);
}
if (objectComponent.componentType === GameLib.Component.COMPONENT_PASS) {
return GameLib.D3.API.Pass.FromObjectComponent(objectComponent);
return GameLib.D3.API.Pass.FromObject(objectComponent);
}
if (objectComponent.componentType === GameLib.Component.COMPONENT_LOOK_AT) {
return GameLib.D3.API.LookAt.FromObjectComponent(objectComponent);
return GameLib.D3.API.LookAt.FromObject(objectComponent);
}
if (objectComponent.componentType === GameLib.Component.COMPONENT_FOLLOW) {
return GameLib.D3.API.Follow.FromObjectComponent(objectComponent);
return GameLib.D3.API.Follow.FromObject(objectComponent);
}
if (objectComponent.componentType === GameLib.Component.COMPONENT_RENDER_TARGET) {
return GameLib.D3.API.RenderTarget.FromObjectComponent(objectComponent);
return GameLib.D3.API.RenderTarget.FromObject(objectComponent);
}
if (objectComponent.componentType === GameLib.Component.COMPONENT_SPLINE) {
return GameLib.D3.API.Spline.FromObjectComponent(objectComponent);
return GameLib.D3.API.Spline.FromObject(objectComponent);
}
if (objectComponent.componentType === GameLib.Component.COMPONENT_INPUT_DRIVE) {
return GameLib.D3.API.Input.Drive.FromObjectComponent(objectComponent);
return GameLib.D3.API.Input.Drive.FromObject(objectComponent);
}
console.warn('No API Component was associated with this Object');

62
src/game-lib-a-component-a.js
View File

@ -81,37 +81,37 @@ GameLib.Component.COMPONENT_IMAGE = 0x1f;
*/
GameLib.Component.GetComponentName = function(number) {
switch(number) {
case 0x1 : return 'PathFollowing';
case 0x2 : return 'Material';
case 0x3 : return 'Renderer';
case 0x4 : return 'LookAt';
case 0x5 : return 'Camera';
case 0x6 : return 'Follow';
case 0x7 : return 'Mesh';
case 0x8 : return 'Spline';
case 0x9 : return 'Light';
case 0xa : return 'InputDrive';
case 0xb : return 'Composer';
case 0xc : return 'RenderTarget';
case 0xd : return 'Pass';
case 0xe : return 'Scene';
case 0xf : return 'Game';
case 0x10 : return 'InputEditor';
case 0x11 : return 'Editor';
case 0x12 : return 'Viewport';
case 0x13 : return 'System';
case 0x14 : return 'Graphics';
case 0x15 : return 'Helper';
case 0x16 : return 'CustomCode';
case 0x17 : return 'Mouse';
case 0x18 : return 'Skeleton';
case 0x19 : return 'Texture';
case 0x1a : return 'EntityManager';
case 0x1b : return 'DomElement';
case 0x1c : return 'ImageFactory';
case 0x1d : return 'Stats';
case 0x1e : return 'GUI';
case 0x1f : return 'Image';
case 0x1 : return 'GameLib.D3.PathFollowing';
case 0x2 : return 'GameLib.D3.Material';
case 0x3 : return 'GameLib.D3.Renderer';
case 0x4 : return 'GameLib.D3.LookAt';
case 0x5 : return 'GameLib.D3.Camera';
case 0x6 : return 'GameLib.D3.Follow';
case 0x7 : return 'GameLib.D3.Mesh';
case 0x8 : return 'GameLib.D3.Spline';
case 0x9 : return 'GameLib.D3.Light';
case 0xa : return 'GameLib.D3.InputDrive';
case 0xb : return 'GameLib.D3.Composer';
case 0xc : return 'GameLib.D3.RenderTarget';
case 0xd : return 'GameLib.D3.Pass';
case 0xe : return 'GameLib.D3.Scene';
case 0xf : return 'GameLib.D3.Game';
case 0x10 : return 'GameLib.D3.InputEditor';
case 0x11 : return 'GameLib.D3.Editor';
case 0x12 : return 'GameLib.D3.Viewport';
case 0x13 : return 'GameLib.System';
case 0x14 : return 'GameLib.D3.Graphics';
case 0x15 : return 'GameLib.D3.Helper';
case 0x16 : return 'GameLib.D3.CustomCode';
case 0x17 : return 'GameLib.Mouse';
case 0x18 : return 'GameLib.D3.Skeleton';
case 0x19 : return 'GameLib.D3.Texture';
case 0x1a : return 'GameLib.EntityManager';
case 0x1b : return 'GameLib.DomElement';
case 0x1c : return 'GameLib.D3.ImageFactory';
case 0x1d : return 'GameLib.D3.Stats';
case 0x1e : return 'GameLib.GUI';
case 0x1f : return 'GameLib.D3.Image';
break;
}
};

2
src/game-lib-api-color.js
View File

@ -35,7 +35,7 @@ GameLib.API.Color = function (r, g, b, a) {
* @param objectColor
* @constructor
*/
GameLib.API.Color.FromObjectColor = function(objectColor) {
GameLib.API.Color.FromObject = function(objectColor) {
return new GameLib.API.Color(
objectColor.r,

2
src/game-lib-api-dom-element.js
View File

@ -49,7 +49,7 @@ GameLib.API.DomElement.prototype.constructor = GameLib.API.DomElement;
* @param objectDomElement
* @constructor
*/
GameLib.API.DomElement.FromObjectDomElement = function (objectDomElement) {
GameLib.API.DomElement.FromObject = function (objectDomElement) {
return new GameLib.API.DomElement(
objectDomElement.id,
objectDomElement.name,

6
src/game-lib-api-entity-manager.js
View File

@ -51,17 +51,17 @@ GameLib.API.EntityManager.prototype.constructor = GameLib.API.EntityManager;
* @param objectEntityManager
* @constructor
*/
GameLib.API.EntityManager.FromObjectEntityManager = function(objectEntityManager) {
GameLib.API.EntityManager.FromObject = function(objectEntityManager) {
var apiEntities = objectEntityManager.entities.map(
function (objectEntity) {
return GameLib.API.Entity.FromObjectEntity(objectEntity);
return GameLib.API.Entity.FromObject(objectEntity);
}
);
// var apiSystems = objectEntityManager.systems.map(
// function (objectSystem) {
// return GameLib.API.System.FromObjectComponent(objectSystem);
// return GameLib.API.System.FromObject(objectSystem);
// }
// );

4
src/game-lib-api-entity.js
View File

@ -60,11 +60,11 @@ GameLib.API.Entity.prototype.constructor = GameLib.API.Entity;
* @param objectEntity
* @constructor
*/
GameLib.API.Entity.FromObjectEntity = function(objectEntity) {
GameLib.API.Entity.FromObject = function(objectEntity) {
var apiComponents = objectEntity.components.map(
function (objectComponent) {
return GameLib.API.Component.FromObjectComponent(objectComponent);
return GameLib.API.Component.FromObject(objectComponent);
}
);

18
src/game-lib-api-matrix4.js
View File

@ -61,21 +61,21 @@ GameLib.API.Matrix4 = function ApiMatrix4(
* @param objectMatrix
* @constructor
*/
GameLib.API.Matrix4.FromObjectMatrix = function(objectMatrix) {
GameLib.API.Matrix4.FromObject = function(objectMatrix) {
if (objectMatrix.rows) {
return new GameLib.API.Matrix4(
GameLib.API.Vector4.FromObjectVector(objectMatrix.rows[0]),
GameLib.API.Vector4.FromObjectVector(objectMatrix.rows[1]),
GameLib.API.Vector4.FromObjectVector(objectMatrix.rows[2]),
GameLib.API.Vector4.FromObjectVector(objectMatrix.rows[3])
GameLib.API.Vector4.FromObject(objectMatrix.rows[0]),
GameLib.API.Vector4.FromObject(objectMatrix.rows[1]),
GameLib.API.Vector4.FromObject(objectMatrix.rows[2]),
GameLib.API.Vector4.FromObject(objectMatrix.rows[3])
);
} else if (objectMatrix instanceof Array) {
return new GameLib.API.Matrix4(
GameLib.API.Vector4.FromObjectVector(objectMatrix[0]),
GameLib.API.Vector4.FromObjectVector(objectMatrix[1]),
GameLib.API.Vector4.FromObjectVector(objectMatrix[2]),
GameLib.API.Vector4.FromObjectVector(objectMatrix[3])
GameLib.API.Vector4.FromObject(objectMatrix[0]),
GameLib.API.Vector4.FromObject(objectMatrix[1]),
GameLib.API.Vector4.FromObject(objectMatrix[2]),
GameLib.API.Vector4.FromObject(objectMatrix[3])
);
} else {
console.warn('Unsupported object matrix type - whats your DB version?');

2
src/game-lib-api-mouse.js
View File

@ -57,7 +57,7 @@ GameLib.API.Mouse.prototype.constructor = GameLib.API.Mouse;
* @param objectMouse
* @constructor
*/
GameLib.API.Mouse.FromObjectMouse = function (objectMouse) {
GameLib.API.Mouse.FromObject = function (objectMouse) {
return new GameLib.API.Mouse(
objectMouse.id,
objectMouse.name,

4
src/game-lib-api-quaternion-a.js
View File

@ -218,12 +218,12 @@ GameLib.API.Quaternion.prototype.slerp = function (quaternion, t) {
* @param objectQuaternion
* @constructor
*/
GameLib.API.Quaternion.FromObjectQuaternion = function (objectQuaternion) {
GameLib.API.Quaternion.FromObject = function (objectQuaternion) {
var apiAxis = null;
if (objectQuaternion.axis) {
apiAxis = GameLib.API.Vector3.FromObjectVector(objectQuaternion.axis);
apiAxis = GameLib.API.Vector3.FromObject(objectQuaternion.axis);
}
return new GameLib.API.Quaternion(

2
src/game-lib-api-system.js
View File

@ -53,7 +53,7 @@ GameLib.API.System.prototype.constructor = GameLib.API.System;
* @param objectComponent
* @constructor
*/
GameLib.API.System.FromObjectComponent = function(objectComponent) {
GameLib.API.System.FromObject = function(objectComponent) {
return new GameLib.API.System(
objectComponent.id,
objectComponent.name,

2
src/game-lib-api-vector2.js
View File

@ -24,7 +24,7 @@ GameLib.API.Vector2.prototype.copy = function () {
* @param objectVector
* @constructor
*/
GameLib.API.Vector2.FromObjectVector = function (objectVector) {
GameLib.API.Vector2.FromObject = function (objectVector) {
return new GameLib.API.Vector2(
objectVector.x,
objectVector.y

2
src/game-lib-api-vector3.js
View File

@ -258,7 +258,7 @@ GameLib.API.Vector3.prototype.angleTo = function (v) {
* @param objectVector
* @constructor
*/
GameLib.API.Vector3.FromObjectVector = function (objectVector) {
GameLib.API.Vector3.FromObject = function (objectVector) {
return new GameLib.API.Vector3(
objectVector.x,
objectVector.y,

2
src/game-lib-api-vector4.js
View File

@ -26,7 +26,7 @@ GameLib.API.Vector4 = function (x, y, z, w) {
* @param objectVector
* @constructor
*/
GameLib.API.Vector4.FromObjectVector = function (objectVector) {
GameLib.API.Vector4.FromObject = function (objectVector) {
return new GameLib.API.Vector4(
objectVector.x,
objectVector.y,

2
src/game-lib-d3-api-bone-weight.js
View File

@ -18,7 +18,7 @@ GameLib.D3.API.BoneWeight = function (
* @returns {GameLib.D3.API.BoneWeight}
* @constructor
*/
GameLib.D3.API.BoneWeight.FromObjectBoneWeight = function(objectBoneWeight) {
GameLib.D3.API.BoneWeight.FromObject = function(objectBoneWeight) {
return new GameLib.D3.API.BoneWeight(
objectBoneWeight.boneIndex,
objectBoneWeight.weight

10
src/game-lib-d3-api-bone.js
View File

@ -67,15 +67,15 @@ GameLib.D3.API.Bone = function (
* @param objectBone
* @constructor
*/
GameLib.D3.API.Bone.FromObjectBone = function(objectBone) {
GameLib.D3.API.Bone.FromObject = function(objectBone) {
return new GameLib.D3.API.Bone(
objectBone.id,
objectBone.name,
objectBone.childBoneIds,
objectBone.parentBoneIds,
GameLib.API.Vector3.FromObjectVector(objectBone.position),
GameLib.API.Quaternion.FromObjectQuaternion(objectBone.quaternion),
GameLib.API.Vector3.FromObjectVector(objectBone.scale),
GameLib.API.Vector3.FromObjectVector(objectBone.up)
GameLib.API.Vector3.FromObject(objectBone.position),
GameLib.API.Quaternion.FromObject(objectBone.quaternion),
GameLib.API.Vector3.FromObject(objectBone.scale),
GameLib.API.Vector3.FromObject(objectBone.up)
);
};

8
src/game-lib-d3-api-camera.js
View File

@ -156,7 +156,7 @@ GameLib.D3.API.Camera.prototype.constructor = GameLib.D3.API.Camera;
* @param objectCamera
* @constructor
*/
GameLib.D3.API.Camera.FromObjectCamera = function(objectCamera) {
GameLib.D3.API.Camera.FromObject = function(objectCamera) {
return new GameLib.D3.API.Camera(
objectCamera.id,
@ -166,15 +166,15 @@ GameLib.D3.API.Camera.FromObjectCamera = function(objectCamera) {
objectCamera.aspect,
objectCamera.near,
objectCamera.far,
GameLib.API.Vector3.FromObjectVector(objectCamera.position),
GameLib.API.Vector3.FromObjectVector(objectCamera.lookAt),
GameLib.API.Vector3.FromObject(objectCamera.position),
GameLib.API.Vector3.FromObject(objectCamera.lookAt),
objectCamera.minX,
objectCamera.maxX,
objectCamera.minY,
objectCamera.maxY,
objectCamera.minZ,
objectCamera.maxZ,
GameLib.API.Quaternion.FromObjectQuaternion(objectCamera.quaternion),
GameLib.API.Quaternion.FromObject(objectCamera.quaternion),
objectCamera.parentEntity,
objectCamera.eyeSeparation,
objectCamera.focalLength

2
src/game-lib-d3-api-composer.js
View File

@ -62,7 +62,7 @@ GameLib.D3.API.Composer.prototype.constructor = GameLib.D3.API.Composer;
* @param objectComponent
* @constructor
*/
GameLib.D3.API.Composer.FromObjectComponent = function(objectComponent) {
GameLib.D3.API.Composer.FromObject = function(objectComponent) {
return new GameLib.D3.API.Composer(
objectComponent.id,
objectComponent.name,

2
src/game-lib-d3-api-custom-code.js
View File

@ -61,7 +61,7 @@ GameLib.D3.API.CustomCode.prototype.constructor = GameLib.D3.API.CustomCode;
* @returns {GameLib.D3.API.CustomCode}
* @constructor
*/
GameLib.D3.API.CustomCode.FromObjectComponent = function(objectComponent) {
GameLib.D3.API.CustomCode.FromObject = function(objectComponent) {
return new GameLib.D3.API.CustomCode(
objectComponent.id,
objectComponent.name,

4
src/game-lib-d3-api-follow.js
View File

@ -84,13 +84,13 @@ GameLib.D3.API.Follow.prototype.constructor = GameLib.D3.API.Follow;
* @returns {GameLib.D3.API.Follow}
* @constructor
*/
GameLib.D3.API.Follow.FromObjectComponent = function(objectComponent) {
GameLib.D3.API.Follow.FromObject = function(objectComponent) {
return new GameLib.D3.API.Follow(
objectComponent.id,
objectComponent.name,
objectComponent.currentComponent,
objectComponent.targetComponent,
GameLib.API.Vector3.FromObjectVector(objectComponent.targetPositionOffset),
GameLib.API.Vector3.FromObject(objectComponent.targetPositionOffset),
objectComponent.minDistance,
objectComponent.moveSpeed,
objectComponent.parentEntity

2
src/game-lib-d3-api-image-factory.js
View File

@ -44,7 +44,7 @@ GameLib.D3.API.ImageFactory.prototype.constructor = GameLib.D3.API.ImageFactory;
* @param objectImageFactory
* @constructor
*/
GameLib.D3.API.ImageFactory.FromObjectImageFactory = function(objectImageFactory) {
GameLib.D3.API.ImageFactory.FromObject = function(objectImageFactory) {
return new GameLib.D3.API.ImageFactory(
objectImageFactory.id,
objectImageFactory.name,

2
src/game-lib-d3-api-input-drive.js
View File

@ -114,7 +114,7 @@ GameLib.D3.API.Input.Drive.prototype.constructor = GameLib.D3.API.Input.Drive;
* @returns {GameLib.D3.API.Input.Drive}
* @constructor
*/
GameLib.D3.API.Input.Drive.FromObjectComponent = function(objectComponent) {
GameLib.D3.API.Input.Drive.FromObject = function(objectComponent) {
return new GameLib.D3.API.Input.Drive(
objectComponent.id,
objectComponent.name,

2
src/game-lib-d3-api-input-editor.js
View File

@ -54,7 +54,7 @@ GameLib.D3.API.Input.Editor.prototype.constructor = GameLib.D3.API.Input.Editor;
* @returns {GameLib.D3.API.Input.Editor}
* @constructor
*/
GameLib.D3.API.Input.Editor.FromObjectComponent = function(objectComponent) {
GameLib.D3.API.Input.Editor.FromObject = function(objectComponent) {
return new GameLib.D3.API.Input.Editor(
objectComponent.id,
objectComponent.name,

14
src/game-lib-d3-api-light.js
View File

@ -136,18 +136,18 @@ GameLib.D3.API.Light.prototype.constructor = GameLib.D3.API.Light;
* @param objectLight
* @constructor
*/
GameLib.D3.API.Light.FromObjectLight = function(objectLight) {
GameLib.D3.API.Light.FromObject = function(objectLight) {
return new GameLib.D3.API.Light(
objectLight.id,
objectLight.lightType,
objectLight.name,
GameLib.API.Color.FromObjectColor(objectLight.color),
GameLib.API.Color.FromObject(objectLight.color),
objectLight.intensity,
GameLib.API.Vector3.FromObjectVector(objectLight.position),
GameLib.API.Vector3.FromObjectVector(objectLight.targetPosition),
GameLib.API.Quaternion.FromObjectQuaternion(objectLight.quaternion),
GameLib.API.Vector3.FromObjectVector(objectLight.rotation),
GameLib.API.Vector3.FromObjectVector(objectLight.scale),
GameLib.API.Vector3.FromObject(objectLight.position),
GameLib.API.Vector3.FromObject(objectLight.targetPosition),
GameLib.API.Quaternion.FromObject(objectLight.quaternion),
GameLib.API.Vector3.FromObject(objectLight.rotation),
GameLib.API.Vector3.FromObject(objectLight.scale),
objectLight.distance,
objectLight.decay,
objectLight.power,

4
src/game-lib-d3-api-look-at.js
View File

@ -77,13 +77,13 @@ GameLib.D3.API.LookAt.prototype.constructor = GameLib.D3.API.LookAt;
* @returns {GameLib.D3.API.LookAt}
* @constructor
*/
GameLib.D3.API.LookAt.FromObjectComponent = function(objectComponent) {
GameLib.D3.API.LookAt.FromObject = function(objectComponent) {
return new GameLib.D3.API.LookAt(
objectComponent.id,
objectComponent.name,
objectComponent.currentComponent,
objectComponent.targetComponent,
GameLib.API.Vector3.FromObjectVector(objectComponent.targetPositionOffset),
GameLib.API.Vector3.FromObject(objectComponent.targetPositionOffset),
objectComponent.rotationSpeed,
objectComponent.parentEntity
);

8
src/game-lib-d3-api-material.js
View File

@ -515,7 +515,7 @@ GameLib.D3.API.Material.prototype.constructor = GameLib.D3.API.Material;
* @param objectMaterial
* @constructor
*/
GameLib.D3.API.Material.FromObjectMaterial = function(objectMaterial) {
GameLib.D3.API.Material.FromObject = function(objectMaterial) {
var apiAlphaMap = null;
var apiAoMap = null;
@ -585,11 +585,11 @@ GameLib.D3.API.Material.FromObjectMaterial = function(objectMaterial) {
objectMaterial.opacity,
objectMaterial.side,
objectMaterial.transparent,
GameLib.API.Color.FromObjectColor(objectMaterial.specular),
GameLib.API.Color.FromObject(objectMaterial.specular),
objectMaterial.lightMapIntensity,
objectMaterial.aoMapIntensity,
GameLib.API.Color.FromObjectColor(objectMaterial.color),
GameLib.API.Color.FromObjectColor(objectMaterial.emissive),
GameLib.API.Color.FromObject(objectMaterial.color),
GameLib.API.Color.FromObject(objectMaterial.emissive),
objectMaterial.emissiveIntensity,
objectMaterial.combine,
objectMaterial.shininess,

24
src/game-lib-d3-api-mesh.js
View File

@ -174,12 +174,12 @@ GameLib.D3.API.Mesh.prototype.constructor = GameLib.D3.API.Mesh;
* @param objectMesh
* @constructor
*/
GameLib.D3.API.Mesh.FromObjectMesh = function (objectMesh){
GameLib.D3.API.Mesh.FromObject = function (objectMesh){
var apiSkeleton = null;
if (objectMesh.skeleton) {
apiSkeleton = GameLib.D3.API.Skeleton.FromObjectSkeleton(objectMesh.skeleton);
apiSkeleton = GameLib.D3.API.Skeleton.FromObject(objectMesh.skeleton);
}
var apiMaterials = [];
@ -190,7 +190,7 @@ GameLib.D3.API.Mesh.FromObjectMesh = function (objectMesh){
* From blender we only get Ids to materials (strings)
*/
if (objectMaterial instanceof Object) {
return GameLib.D3.API.Material.FromObjectMaterial(objectMaterial);
return GameLib.D3.API.Material.FromObject(objectMaterial);
} else {
return objectMaterial
}
@ -202,49 +202,49 @@ GameLib.D3.API.Mesh.FromObjectMesh = function (objectMesh){
if (objectMesh.vertices) {
apiVertices = objectMesh.vertices.map(
function (objectVertex) {
return GameLib.D3.API.Vertex.FromObjectVertex(objectVertex);
return GameLib.D3.API.Vertex.FromObject(objectVertex);
}
)
}
var apiPosition = new GameLib.API.Vector3();
if (objectMesh.position) {
apiPosition = GameLib.API.Vector3.FromObjectVector(objectMesh.position);
apiPosition = GameLib.API.Vector3.FromObject(objectMesh.position);
}
var apiQuaternion = new GameLib.API.Quaternion();
if (objectMesh.quaternion) {
apiQuaternion = GameLib.API.Quaternion.FromObjectQuaternion(objectMesh.quaternion);
apiQuaternion = GameLib.API.Quaternion.FromObject(objectMesh.quaternion);
}
var apiScale = new GameLib.API.Vector3(1,1,1);
if (objectMesh.scale) {
apiScale = GameLib.API.Vector3.FromObjectVector(objectMesh.scale);
apiScale = GameLib.API.Vector3.FromObject(objectMesh.scale);
}
var apiLocalPosition = new GameLib.API.Vector3();
if (objectMesh.localPosition) {
apiLocalPosition = GameLib.API.Vector3.FromObjectVector(objectMesh.localPosition);
apiLocalPosition = GameLib.API.Vector3.FromObject(objectMesh.localPosition);
}
var apiLocalRotation = new GameLib.API.Vector3();
if (objectMesh.localRotation) {
apiLocalRotation = GameLib.API.Vector3.FromObjectVector(objectMesh.localRotation);
apiLocalRotation = GameLib.API.Vector3.FromObject(objectMesh.localRotation);
}
var apiLocalScale = new GameLib.API.Vector3(1,1,1);
if (objectMesh.localScale) {
apiLocalScale = GameLib.API.Vector3.FromObjectVector(objectMesh.localScale);
apiLocalScale = GameLib.API.Vector3.FromObject(objectMesh.localScale);
}
var apiUp = new GameLib.API.Vector3(0,1,0);
if (objectMesh.up) {
apiUp = GameLib.API.Vector3.FromObjectVector(objectMesh.up);
apiUp = GameLib.API.Vector3.FromObject(objectMesh.up);
}
var apiModelMatrix = new GameLib.API.Matrix4();
if (objectMesh.modelMatrix) {
apiModelMatrix = GameLib.API.Matrix4.FromObjectMatrix(objectMesh.modelMatrix);
apiModelMatrix = GameLib.API.Matrix4.FromObject(objectMesh.modelMatrix);
}
return new GameLib.D3.API.Mesh(

2
src/game-lib-d3-api-pass.js
View File

@ -78,7 +78,7 @@ GameLib.D3.API.Pass.prototype.constructor = GameLib.D3.API.Pass;
* @param objectComponent
* @constructor
*/
GameLib.D3.API.Pass.FromObjectComponent = function(objectComponent) {
GameLib.D3.API.Pass.FromObject = function(objectComponent) {
return new GameLib.D3.API.Pass(
objectComponent.id,
objectComponent.name,

22
src/game-lib-d3-api-path-following.js
View File

@ -174,12 +174,12 @@ GameLib.D3.API.PathFollowing.prototype.constructor = GameLib.D3.API.PathFollowin
* @param objectComponent
* @constructor
*/
GameLib.D3.API.PathFollowing.FromObjectComponent = function(objectComponent) {
GameLib.D3.API.PathFollowing.FromObject = function(objectComponent) {
var apiRaycaster = null;
if (objectComponent.raycaster) {
apiRaycaster = GameLib.D3.API.Raycaster.FromObjectRaycaster(objectComponent.raycaster);
apiRaycaster = GameLib.D3.API.Raycaster.FromObject(objectComponent.raycaster);
}
return new GameLib.D3.API.PathFollowing(
@ -190,20 +190,20 @@ GameLib.D3.API.PathFollowing.FromObjectComponent = function(objectComponent) {
objectComponent.raytraceMesh,
objectComponent.accelleration,
objectComponent.maxSpeed,
GameLib.API.Vector3.FromObjectVector(objectComponent.baseOffset),
GameLib.API.Vector3.FromObjectVector(objectComponent.maxOffset),
GameLib.API.Vector3.FromObject(objectComponent.baseOffset),
GameLib.API.Vector3.FromObject(objectComponent.maxOffset),
objectComponent.steeringSpeed,
GameLib.API.Vector3.FromObjectVector(objectComponent.targetOffset),
GameLib.API.Vector3.FromObjectVector(objectComponent.currentOffset),
GameLib.API.Vector3.FromObject(objectComponent.targetOffset),
GameLib.API.Vector3.FromObject(objectComponent.currentOffset),
objectComponent.currentPathValue,
objectComponent.currentSpeed,
objectComponent.direction,
apiRaycaster,
GameLib.API.Vector3.FromObjectVector(objectComponent.currentPosition),
GameLib.API.Vector3.FromObjectVector(objectComponent.futurePosition),
GameLib.API.Vector3.FromObjectVector(objectComponent.up),
GameLib.API.Matrix4.FromObjectMatrix(objectComponent.rotationMatrix),
GameLib.API.Quaternion.FromObjectQuaternion(objectComponent.rotationVector),
GameLib.API.Vector3.FromObject(objectComponent.currentPosition),
GameLib.API.Vector3.FromObject(objectComponent.futurePosition),
GameLib.API.Vector3.FromObject(objectComponent.up),
GameLib.API.Matrix4.FromObject(objectComponent.rotationMatrix),
GameLib.API.Quaternion.FromObject(objectComponent.rotationVector),
objectComponent.parentEntity
);
};

6
src/game-lib-d3-api-raycaster.js
View File

@ -39,11 +39,11 @@ GameLib.D3.API.Raycaster = function(
* @param objectRaycaster
* @constructor
*/
GameLib.D3.API.Raycaster.FromObjectRaycaster = function(objectRaycaster) {
GameLib.D3.API.Raycaster.FromObject = function(objectRaycaster) {
return new GameLib.D3.API.Raycaster(
objectRaycaster.id,
objectRaycaster.name,
GameLib.API.Vector3.FromObjectVector(objectRaycaster.position),
GameLib.API.Vector3.FromObjectVector(objectRaycaster.direction)
GameLib.API.Vector3.FromObject(objectRaycaster.position),
GameLib.API.Vector3.FromObject(objectRaycaster.direction)
);
};

2
src/game-lib-d3-api-render-target.js
View File

@ -89,7 +89,7 @@ GameLib.D3.API.RenderTarget.prototype.constructor = GameLib.D3.API.RenderTarget;
* @param objectComponent
* @constructor
*/
GameLib.D3.API.RenderTarget.FromObjectComponent = function(objectComponent) {
GameLib.D3.API.RenderTarget.FromObject = function(objectComponent) {
return new GameLib.D3.API.RenderTarget(
objectComponent.id,
objectComponent.name,

2
src/game-lib-d3-api-renderer.js
View File

@ -88,7 +88,7 @@ GameLib.D3.API.Renderer.prototype.constructor = GameLib.D3.API.Renderer;
* @param objectComponent
* @constructor
*/
GameLib.D3.API.Renderer.FromObjectComponent = function(objectComponent) {
GameLib.D3.API.Renderer.FromObject = function(objectComponent) {
return new GameLib.D3.API.Renderer(
objectComponent.id,
objectComponent.name,

16
src/game-lib-d3-api-scene.js
View File

@ -114,7 +114,7 @@ GameLib.D3.API.Scene.prototype.constructor = GameLib.D3.API.Scene;
* @param objectScene
* @constructor
*/
GameLib.D3.API.Scene.FromObjectScene = function(objectScene) {
GameLib.D3.API.Scene.FromObject = function(objectScene) {
var apiMeshes = [];
var apiLights = [];
@ -131,7 +131,7 @@ GameLib.D3.API.Scene.FromObjectScene = function(objectScene) {
if (objectScene.meshes) {
apiMeshes = objectScene.meshes.map(
function(objectMesh) {
return GameLib.D3.API.Mesh.FromObjectMesh(objectMesh);
return GameLib.D3.API.Mesh.FromObject(objectMesh);
}
)
}
@ -139,7 +139,7 @@ GameLib.D3.API.Scene.FromObjectScene = function(objectScene) {
if (objectScene.lights) {
apiLights = objectScene.lights.map(
function(objectLight) {
return GameLib.D3.API.Light.FromObjectLight(objectLight);
return GameLib.D3.API.Light.FromObject(objectLight);
}
)
}
@ -147,7 +147,7 @@ GameLib.D3.API.Scene.FromObjectScene = function(objectScene) {
if (objectScene.textures) {
apiTextures = objectScene.textures.map(
function(objectTexture) {
return GameLib.D3.API.Texture.FromObjectTexture(objectTexture)
return GameLib.D3.API.Texture.FromObject(objectTexture)
}
)
}
@ -155,7 +155,7 @@ GameLib.D3.API.Scene.FromObjectScene = function(objectScene) {
if (objectScene.materials) {
apiMaterials = objectScene.materials.map(
function(objectMaterial) {
return GameLib.D3.API.Material.FromObjectMaterial(objectMaterial)
return GameLib.D3.API.Material.FromObject(objectMaterial)
}
)
}
@ -169,15 +169,15 @@ GameLib.D3.API.Scene.FromObjectScene = function(objectScene) {
}
if (objectScene.position) {
apiPosition = GameLib.API.Vector3.FromObjectVector(objectScene.position);
apiPosition = GameLib.API.Vector3.FromObject(objectScene.position);
}
if (objectScene.quaternion) {
apiQuaternion = GameLib.API.Quaternion.FromObjectQuaternion(objectScene.quaternion);
apiQuaternion = GameLib.API.Quaternion.FromObject(objectScene.quaternion);
}
if (objectScene.scale) {
apiScale = GameLib.API.Vector3.FromObjectVector(objectScene.scale);
apiScale = GameLib.API.Vector3.FromObject(objectScene.scale);
}
if (objectScene.activeCamera) {

8
src/game-lib-d3-api-skeleton.js
View File

@ -101,18 +101,18 @@ GameLib.D3.API.Skeleton.prototype.constructor = GameLib.D3.API.Skeleton;
* @param objectSkeleton
* @constructor
*/
GameLib.D3.API.Skeleton.FromObjectSkeleton = function(objectSkeleton) {
GameLib.D3.API.Skeleton.FromObject = function(objectSkeleton) {
return new GameLib.D3.API.Skeleton(
objectSkeleton.id,
objectSkeleton.name,
objectSkeleton.bones.map(
function (objectBone) {
return GameLib.D3.API.Bone.FromObjectBone(objectBone);
return GameLib.D3.API.Bone.FromObject(objectBone);
}
),
objectSkeleton.boneInverses.map(
function (boneInverse) {
return GameLib.D3.API.Matrix4.FromObjectMatrix(boneInverse);
return GameLib.D3.API.Matrix4.FromObject(boneInverse);
}
),
objectSkeleton.useVertexTexture,
@ -120,7 +120,7 @@ GameLib.D3.API.Skeleton.FromObjectSkeleton = function(objectSkeleton) {
objectSkeleton.boneTextureHeight,
objectSkeleton.boneMatrices.map(
function (boneMatrix) {
return GameLib.D3.API.Matrix4.FromObjectMatrix(boneMatrix);
return GameLib.D3.API.Matrix4.FromObject(boneMatrix);
}
),
objectSkeleton.boneTexture,

4
src/game-lib-d3-api-spline.js
View File

@ -43,13 +43,13 @@ GameLib.D3.API.Spline.prototype.constructor = GameLib.D3.API.Spline;
* @param objectComponent
* @constructor
*/
GameLib.D3.API.Spline.FromObjectComponent = function(objectComponent) {
GameLib.D3.API.Spline.FromObject = function(objectComponent) {
return new GameLib.D3.API.Spline(
objectComponent.id,
objectComponent.name,
objectComponent.vertices.map(
function (objectVertex) {
return GameLib.API.Vector3.FromObjectVector(objectVertex);
return GameLib.API.Vector3.FromObject(objectVertex);
}
),
objectComponent.parentEntity

6
src/game-lib-d3-api-texture.js
View File

@ -178,7 +178,7 @@ GameLib.D3.API.Texture.prototype.constructor = GameLib.D3.API.Texture;
* @param objectTexture
* @constructor
*/
GameLib.D3.API.Texture.FromObjectTexture = function(objectTexture) {
GameLib.D3.API.Texture.FromObject = function(objectTexture) {
return new GameLib.D3.API.Texture(
objectTexture.id,
objectTexture.textureType,
@ -186,7 +186,7 @@ GameLib.D3.API.Texture.FromObjectTexture = function(objectTexture) {
objectTexture.image,
objectTexture.wrapS,
objectTexture.wrapT,
GameLib.API.Vector2.FromObjectVector(objectTexture.repeat),
GameLib.API.Vector2.FromObject(objectTexture.repeat),
objectTexture.data,
objectTexture.format,
objectTexture.mapping,
@ -194,7 +194,7 @@ GameLib.D3.API.Texture.FromObjectTexture = function(objectTexture) {
objectTexture.minFilter,
objectTexture.textureType,
objectTexture.anisotropy,
GameLib.API.Vector2.FromObjectVector(objectTexture.offset),
GameLib.API.Vector2.FromObject(objectTexture.offset),
objectTexture.generateMipmaps,
objectTexture.flipY,
objectTexture.mipmaps,

6
src/game-lib-d3-api-vertex.js
View File

@ -25,12 +25,12 @@ GameLib.D3.API.Vertex = function(
* @param objectVertex
* @constructor
*/
GameLib.D3.API.Vertex.FromObjectVertex = function(objectVertex) {
GameLib.D3.API.Vertex.FromObject = function(objectVertex) {
return new GameLib.D3.API.Vertex(
GameLib.API.Vector3.FromObjectVector(objectVertex.position),
GameLib.API.Vector3.FromObject(objectVertex.position),
objectVertex.boneWeights.map(
function(boneWeight) {
return GameLib.D3.API.BoneWeight.FromObjectBoneWeight(boneWeight);
return GameLib.D3.API.BoneWeight.FromObject(boneWeight);
}
)
);

2
src/game-lib-d3-api-viewport.js
View File

@ -73,7 +73,7 @@ GameLib.D3.API.Viewport.prototype.constructor = GameLib.D3.API.Viewport;
* @param objectViewport
* @constructor
*/
GameLib.D3.API.Viewport.FromObjectComponent = function(objectViewport) {
GameLib.D3.API.Viewport.FromObject = function(objectViewport) {
return new GameLib.D3.API.Viewport(
objectViewport.id,
objectViewport.name,

4
src/game-lib-d3-bone-weight.js
View File

@ -50,11 +50,11 @@ GameLib.D3.BoneWeight.prototype.toApiObject = function() {
* @returns {GameLib.D3.BoneWeight}
* @constructor
*/
GameLib.D3.BoneWeight.FromObjectBoneWeight = function(
GameLib.D3.BoneWeight.FromObject = function(
graphics,
objectBoneWeight
) {
var apiBoneWeight = GameLib.D3.API.BoneWeight.FromObjectBoneWeight(objectBoneWeight);
var apiBoneWeight = GameLib.D3.API.BoneWeight.FromObject(objectBoneWeight);
var boneWeight = new GameLib.D3.BoneWeight(
graphics,

4
src/game-lib-d3-bone.js
View File

@ -132,11 +132,11 @@ GameLib.D3.Bone.prototype.toApiObject = function() {
* @returns {GameLib.D3.Bone}
* @constructor
*/
GameLib.D3.Bone.FromObjectBone = function(
GameLib.D3.Bone.FromObject = function(
graphics,
objectBone
) {
var apiBone = GameLib.D3.API.Bone.FromObjectBone(objectBone);
var apiBone = GameLib.D3.API.Bone.FromObject(objectBone);
var bone = GameLib.D3.Bone(
graphics,

4
src/game-lib-d3-camera.js
View File

@ -225,9 +225,9 @@ GameLib.D3.Camera.prototype.toApiObject = function() {
* @returns {GameLib.D3.Camera}
* @constructor
*/
GameLib.D3.Camera.FromObjectCamera = function(graphics, objectCamera) {
GameLib.D3.Camera.FromObject = function(graphics, objectCamera) {
var apiCamera = GameLib.D3.API.Camera.FromObjectCamera(objectCamera);
var apiCamera = GameLib.D3.API.Camera.FromObject(objectCamera);
return new GameLib.D3.Camera(
graphics,

4
src/game-lib-d3-composer.js
View File

@ -138,9 +138,9 @@ GameLib.D3.Composer.prototype.toApiObject = function() {
* @returns {GameLib.D3.Composer}
* @constructor
*/
GameLib.D3.Composer.FromObjectComponent = function(graphics, objectComponent) {
GameLib.D3.Composer.FromObject = function(graphics, objectComponent) {
var apiComposer = GameLib.D3.API.Composer.FromObjectComponent(objectComponent);
var apiComposer = GameLib.D3.API.Composer.FromObject(objectComponent);
return new GameLib.D3.Composer(
graphics,

4
src/game-lib-d3-custom-code.js
View File

@ -88,9 +88,9 @@ GameLib.D3.CustomCode.prototype.toApiObject = function() {
* @returns {GameLib.D3.CustomCode}
* @constructor
*/
GameLib.D3.CustomCode.FromObjectCustomCode = function(objectCustomCode) {
GameLib.D3.CustomCode.FromObject = function(objectCustomCode) {
var apiCustomCode = GameLib.D3.API.CustomCode.FromObjectCustomCode(objectCustomCode);
var apiCustomCode = GameLib.D3.API.CustomCode.FromObject(objectCustomCode);
return new GameLib.D3.CustomCode(
apiCustomCode

4
src/game-lib-d3-follow.js
View File

@ -84,9 +84,9 @@ GameLib.D3.Follow.prototype.toApiObject = function() {
return apiFollow;
};
GameLib.D3.Follow.FromObjectComponent = function(graphics, objectComponent) {
GameLib.D3.Follow.FromObject = function(graphics, objectComponent) {
var apiFollow = GameLib.D3.API.Follow.FromObjectComponent(objectComponent);
var apiFollow = GameLib.D3.API.Follow.FromObject(objectComponent);
return new GameLib.D3.Follow(
graphics,

4
src/game-lib-d3-image-factory.js
View File

@ -140,11 +140,11 @@ GameLib.D3.ImageFactory.prototype.toApiObject = function() {
* @param objectImageFactory GameLib.D3.API.ImageFactory
* @returns {GameLib.D3.ImageFactory}
*/
GameLib.D3.ImageFactory.FromObjectImageFactory = function(graphics, objectImageFactory) {
GameLib.D3.ImageFactory.FromObject = function(graphics, objectImageFactory) {
return new GameLib.D3.ImageFactory(
graphics,
GameLib.D3.API.ImageFactory.FromObjectImageFactory(objectImageFactory)
GameLib.D3.API.ImageFactory.FromObject(objectImageFactory)
);
};

4
src/game-lib-d3-input-drive.js
View File

@ -125,9 +125,9 @@ GameLib.D3.Input.Drive.prototype.toApiObject = function() {
return apiInputDrive;
};
GameLib.D3.Input.Drive.FromObjectComponent = function(graphics, objectComponent) {
GameLib.D3.Input.Drive.FromObject = function(graphics, objectComponent) {
var apiInputDrive = GameLib.D3.API.Input.Drive.FromObjectComponent(objectComponent);
var apiInputDrive = GameLib.D3.API.Input.Drive.FromObject(objectComponent);
return new GameLib.D3.Input.Drive(
graphics,

6
src/game-lib-d3-input-editor.js
View File

@ -107,9 +107,9 @@ GameLib.D3.Input.Editor.prototype.toApiObject = function() {
return apiInputEditor;
};
GameLib.D3.Input.Editor.FromObjectComponent = function(graphics, objectComponent) {
GameLib.D3.Input.Editor.FromObject = function(graphics, objectComponent) {
var apiInputEditor = GameLib.D3.API.Input.Editor.FromObjectComponent(objectComponent);
var apiInputEditor = GameLib.D3.API.Input.Editor.FromObject(objectComponent);
return new GameLib.D3.Input.Editor(
graphics,
@ -270,7 +270,7 @@ GameLib.D3.Input.Editor.prototype.onMouseDown = function(entity, entityManager)
return function(event) {
if (event.button === 2) {
if (event.button === 0 || event.button === 2) {
if (this.controlLeft) {
return;

4
src/game-lib-d3-light.js
View File

@ -304,11 +304,11 @@ GameLib.D3.Light.prototype.toApiObject = function() {
* @param objectLight GameLib.D3.API.Light
* @returns {GameLib.D3.Light}
*/
GameLib.D3.Light.FromObjectLight = function(graphics, objectLight) {
GameLib.D3.Light.FromObject = function(graphics, objectLight) {
return new GameLib.D3.Light(
graphics,
GameLib.D3.API.Light.FromObjectLight(objectLight)
GameLib.D3.API.Light.FromObject(objectLight)
);
};

4
src/game-lib-d3-look-at.js
View File

@ -81,9 +81,9 @@ GameLib.D3.LookAt.prototype.toApiObject = function() {
return apiLookAt;
};
GameLib.D3.LookAt.FromObjectComponent = function(graphics, objectComponent) {
GameLib.D3.LookAt.FromObject = function(graphics, objectComponent) {
var apiLookAt = GameLib.D3.API.LookAt.FromObjectComponent(objectComponent);
var apiLookAt = GameLib.D3.API.LookAt.FromObject(objectComponent);
return new GameLib.D3.LookAt(
graphics,

4
src/game-lib-d3-material.js
View File

@ -1096,11 +1096,11 @@ GameLib.D3.Material.prototype.toApiObject = function(save) {
* @param objectMaterial Object
* @constructor
*/
GameLib.D3.Material.FromObjectMaterial = function(graphics, objectMaterial) {
GameLib.D3.Material.FromObject = function(graphics, objectMaterial) {
var gameLibMaterial = new GameLib.D3.Material(
graphics,
GameLib.D3.API.Material.FromObjectMaterial(objectMaterial)
GameLib.D3.API.Material.FromObject(objectMaterial)
);
return gameLibMaterial;

4
src/game-lib-d3-mesh-0.js
View File

@ -536,9 +536,9 @@ GameLib.D3.Mesh.prototype.toApiObject = function(save) {
* @param objectMesh {Object}
* @constructor
*/
GameLib.D3.Mesh.FromObjectMesh = function(graphics, objectMesh) {
GameLib.D3.Mesh.FromObject = function(graphics, objectMesh) {
var apiMesh = GameLib.D3.API.Mesh.FromObjectMesh(objectMesh);
var apiMesh = GameLib.D3.API.Mesh.FromObject(objectMesh);
return new GameLib.D3.Mesh(
graphics,

4
src/game-lib-d3-mesh-sphere.js
View File

@ -77,9 +77,9 @@ GameLib.D3.Mesh.Sphere.prototype.toApiObject = function() {
* @param imageFactory GameLib.D3.ImageFactory
* @constructor
*/
GameLib.D3.Mesh.Sphere.FromObjectMesh = function(graphics, objectMesh, computeNormals, imageFactory) {
GameLib.D3.Mesh.Sphere.FromObject = function(graphics, objectMesh, computeNormals, imageFactory) {
var apiMesh = GameLib.D3.API.Mesh.FromObjectMesh(objectMesh);
var apiMesh = GameLib.D3.API.Mesh.FromObject(objectMesh);
return new GameLib.D3.Mesh.Sphere(
graphics,

4
src/game-lib-d3-pass.js
View File

@ -123,9 +123,9 @@ GameLib.D3.Pass.prototype.toApiObject = function() {
* @returns {GameLib.D3.Pass}
* @constructor
*/
GameLib.D3.Pass.FromObjectComponent = function(graphics, objectComponent) {
GameLib.D3.Pass.FromObject = function(graphics, objectComponent) {
var apiPass = GameLib.D3.API.Pass.FromObjectComponent(objectComponent);
var apiPass = GameLib.D3.API.Pass.FromObject(objectComponent);
return new GameLib.D3.Pass(
graphics,

4
src/game-lib-d3-path-following.js
View File

@ -152,9 +152,9 @@ GameLib.D3.PathFollowing.prototype.toApiObject = function() {
* @returns {GameLib.D3.PathFollowing}
* @constructor
*/
GameLib.D3.PathFollowing.FromObjectComponent = function(graphics, objectComponent) {
GameLib.D3.PathFollowing.FromObject = function(graphics, objectComponent) {
var apiPathFollowing = GameLib.D3.API.PathFollowing.FromObjectComponent(objectComponent);
var apiPathFollowing = GameLib.D3.API.PathFollowing.FromObject(objectComponent);
return new GameLib.D3.PathFollowing(
graphics,

4
src/game-lib-d3-raycaster.js
View File

@ -81,9 +81,9 @@ GameLib.D3.Raycaster.prototype.toApiObject = function() {
)
};
GameLib.D3.Raycaster.FromObjectRaycaster = function(graphics, parentObject, objectRaycaster) {
GameLib.D3.Raycaster.FromObject = function(graphics, parentObject, objectRaycaster) {
var apiRaycaster = GameLib.D3.API.Raycaster.FromObjectRaycaster(objectRaycaster);
var apiRaycaster = GameLib.D3.API.Raycaster.FromObject(objectRaycaster);
var raycaster = new GameLib.D3.Raycaster(
graphics,

4
src/game-lib-d3-render-target.js
View File

@ -124,9 +124,9 @@ GameLib.D3.RenderTarget.prototype.toApiObject = function() {
* @returns {GameLib.D3.RenderTarget}
* @constructor
*/
GameLib.D3.RenderTarget.FromObjectComponent = function(graphics, objectComponent) {
GameLib.D3.RenderTarget.FromObject = function(graphics, objectComponent) {
var apiRenderTarget = GameLib.D3.API.RenderTarget.FromObjectComponent(objectComponent);
var apiRenderTarget = GameLib.D3.API.RenderTarget.FromObject(objectComponent);
return new GameLib.D3.RenderTarget(
graphics,

4
src/game-lib-d3-renderer.js
View File

@ -122,9 +122,9 @@ GameLib.D3.Renderer.prototype.toApiObject = function() {
* @returns {GameLib.D3.Renderer}
* @constructor
*/
GameLib.D3.Renderer.FromObjectComponent = function(graphics, objectComponent) {
GameLib.D3.Renderer.FromObject = function(graphics, objectComponent) {
var apiRenderer = GameLib.D3.API.Renderer.FromObjectComponent(objectComponent);
var apiRenderer = GameLib.D3.API.Renderer.FromObject(objectComponent);
return new GameLib.D3.Renderer(
graphics,

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

@ -266,11 +266,11 @@ GameLib.D3.Scene.prototype.toApiObject = function(save) {
* @returns {GameLib.D3.Scene}
* @constructor
*/
GameLib.D3.Scene.FromObjectScene = function(
GameLib.D3.Scene.FromObject = function(
graphics,
objectScene
) {
var apiScene = GameLib.D3.API.Scene.FromObjectScene(objectScene);
var apiScene = GameLib.D3.API.Scene.FromObject(objectScene);
return new GameLib.D3.Scene(
graphics,

4
src/game-lib-d3-skeleton.js
View File

@ -213,7 +213,7 @@ GameLib.D3.Skeleton.prototype.toApiObject = function() {
* @returns {GameLib.D3.Skeleton}
* @constructor
*/
GameLib.D3.Skeleton.FromObjectSkeleton = function(
GameLib.D3.Skeleton.FromObject = function(
graphics,
objectSkeleton
) {
@ -222,7 +222,7 @@ GameLib.D3.Skeleton.FromObjectSkeleton = function(
return null;
}
var apiSkeleton = GameLib.D3.API.Skeleton.FromObjectSkeleton(objectSkeleton);
var apiSkeleton = GameLib.D3.API.Skeleton.FromObject(objectSkeleton);
var skeleton = new GameLib.D3.Skeleton(
graphics,

4
src/game-lib-d3-spline.js
View File

@ -95,11 +95,11 @@ GameLib.D3.Spline.prototype.toApiObject = function() {
* @returns {GameLib.D3.Spline}
* @constructor
*/
GameLib.D3.Spline.FromObjectComponent = function(
GameLib.D3.Spline.FromObject = function(
graphics,
objectComponent
) {
var apiSpline = GameLib.D3.API.Spline.FromObjectComponent(objectComponent);
var apiSpline = GameLib.D3.API.Spline.FromObject(objectComponent);
return new GameLib.D3.Spline(
graphics,

4
src/game-lib-d3-texture.js
View File

@ -391,11 +391,11 @@ GameLib.D3.Texture.prototype.toApiObject = function(save) {
* @param objectTexture Object
* @constructor
*/
GameLib.D3.Texture.FromObjectTexture = function(
GameLib.D3.Texture.FromObject = function(
graphics,
objectTexture
) {
var apiTexture = GameLib.D3.API.Texture.FromObjectTexture(objectTexture);
var apiTexture = GameLib.D3.API.Texture.FromObject(objectTexture);
return new GameLib.D3.Texture(
graphics,

4
src/game-lib-d3-vertex.js
View File

@ -66,11 +66,11 @@ GameLib.D3.Vertex.prototype.toApiObject = function() {
* @returns {GameLib.D3.Vertex}
* @constructor
*/
GameLib.D3.Vertex.FromObjectVertex = function(
GameLib.D3.Vertex.FromObject = function(
graphics,
objectVertex
) {
var apiVertex = GameLib.D3.API.Vertex.FromObjectVertex(objectVertex);
var apiVertex = GameLib.D3.API.Vertex.FromObject(objectVertex);
return new GameLib.D3.Vertex(
graphics,

4
src/game-lib-d3-viewport.js
View File

@ -94,9 +94,9 @@ GameLib.D3.Viewport.prototype.toApiObject = function() {
* @returns {GameLib.D3.Viewport}
* @constructor
*/
GameLib.D3.Viewport.FromObjectComponent = function(graphics, objectComponent) {
GameLib.D3.Viewport.FromObject = function(graphics, objectComponent) {
var apiViewport = GameLib.D3.API.Viewport.FromObjectComponent(objectComponent);
var apiViewport = GameLib.D3.API.Viewport.FromObject(objectComponent);
return new GameLib.D3.Viewport(
graphics,

68
src/game-lib-entity-manager.js
View File

@ -303,9 +303,9 @@ GameLib.EntityManager.prototype.toApiObject = function() {
* @param objectEntityManager Object
* @constructor
*/
GameLib.EntityManager.FromObjectEntityManager = function(graphics, objectEntityManager) {
GameLib.EntityManager.FromObject = function(graphics, objectEntityManager) {
var apiEntityManager = GameLib.API.EntityManager.FromObjectEntityManager(objectEntityManager);
var apiEntityManager = GameLib.API.EntityManager.FromObject(objectEntityManager);
var entityManager = new GameLib.EntityManager(
graphics,
@ -331,14 +331,19 @@ GameLib.EntityManager.prototype.onParentSceneChange = function(data) {
*/
var helper = this.findHelperByObject(data.object);
if (helper) {
data.originalScene.instance.remove(helper.instance);
if (data.originalScene && data.originalScene.instance) {
data.originalScene.instance.remove(helper.instance);
}
data.newScene.instance.add(helper.instance);
}
/**
* We remove the mesh from the old scene and add it to the new scene
*/
data.originalScene.removeObject(data.object);
if (data.originalScene && data.originalScene.removeObject) {
data.originalScene.removeObject(data.object);
}
data.newScene.addObject(data.object);
/**
@ -355,33 +360,42 @@ GameLib.EntityManager.prototype.onParentSceneChange = function(data) {
newEntity = data.newScene.parentEntity;
}
if (originalEntity && newEntity) {
var gui = null;
/**
* We also transfer the helper (as a component) to the new entity
*/
if (helper) {
originalEntity.removeComponent(helper);
newEntity.addComponent(helper);
}
if (originalEntity) {
originalEntity.removeComponent(data.object);
newEntity.addComponent(data.object);
if (originalEntity.removeComponent) {
if (helper) {
originalEntity.removeComponent(helper);
}
originalEntity.removeComponent(data.object);
}
/**
* Now also remove the object from the GUI
*/
var gui = originalEntity.getFirstComponent(GameLib.GUI);
if (gui) {
gui.removeObject(data.object);
gui.build(this);
if (originalEntity.getFirstComponent) {
gui = originalEntity.getFirstComponent(GameLib.GUI);
if (gui) {
gui.removeObject(data.object);
gui.build(this);
}
}
}
gui = newEntity.getFirstComponent(GameLib.GUI);
if (gui) {
gui.addObject(data.object);
gui.build(this);
}
}
if (newEntity) {
if (newEntity.addComponent) {
if (helper) {
newEntity.addComponent(helper);
}
newEntity.addComponent(data.object);
}
if (newEntity.getFirstComponent) {
gui = newEntity.getFirstComponent(GameLib.GUI);
if (gui) {
gui.addObject(data.object);
gui.build(this);
}
}
}
}

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

@ -228,9 +228,9 @@ GameLib.Entity.prototype.toApiObject = function() {
* @param objectEntity Object
* @constructor
*/
GameLib.Entity.FromObjectEntity = function(graphics, objectEntity) {
GameLib.Entity.FromObject = function(graphics, objectEntity) {
var apiEntity = GameLib.API.Entity.FromObjectEntity(objectEntity);
var apiEntity = GameLib.API.Entity.FromObject(objectEntity);
return new GameLib.Entity(
graphics,

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

@ -167,9 +167,9 @@ GameLib.Matrix4.prototype.toApiObject = function () {
* @returns {GameLib.Matrix4}
* @constructor
*/
GameLib.Matrix4.FromObjectMatrix = function(graphics, objectMatrix, parentObject) {
GameLib.Matrix4.FromObject = function(graphics, objectMatrix, parentObject) {
var apiMatrix = new GameLib.API.Matrix4.FromObjectMatrix(objectMatrix);
var apiMatrix = new GameLib.API.Matrix4.FromObject(objectMatrix);
return new GameLib.Matrix4(
graphics,