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

register updates

beta.r3js.org
-=yb4f310 2017-12-04 14:10:12 +01:00
parent 70ebe7a5ec
commit 8068dcf3ef
7 changed files with 251 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

86
build/game-lib.js
View File

@ -1,5 +1,5 @@
// COMPILE TIME DEFINITIONS (Generated via gulp)
var __DATE__ = "Mon Dec 04 2017 13:21:42 GMT+0100 (CET)";
var __DATE__ = "Mon Dec 04 2017 14:10:07 GMT+0100 (CET)";
// END COMPILE TIME DEFINITIONS
/**
@ -1581,6 +1581,7 @@ GameLib.Component.PARTICLE = 0x54;
GameLib.Component.AUDIO = 0x55;
GameLib.Component.SYSTEM_AUDIO = 0x56;
GameLib.Component.CAST = 0x57;
GameLib.Component.MAX_COMPONENTS = 0x58;
GameLib.Component.GRAPHICS_RUNTIME = 0x1;
GameLib.Component.PHYSICS_RUNTIME = 0x2;
@ -1590,8 +1591,11 @@ GameLib.Component.DEFAULT_RUNTIME = 0x5;
GameLib.Component.GUI_RUNTIME = 0x6;
GameLib.Component.CODER_RUNTIME = 0x7;
GameLib.Component.GetCompentType = function(constructor) {
console.log('todo: implement?');
GameLib.Component.GetCompentTypes = function(constructor) {
if (constructor === GameLib.Component) {
}
};
/**
@ -23320,7 +23324,8 @@ GameLib.EntityManager.prototype.findEntities = function(components) {
/**
* Returns all actual components of all entities that contain this component
* @param componentTypes (array of constructor or just a single constructor)
* More efficient
* @param componentTypes (array of component types or a single component type)
*/
GameLib.EntityManager.prototype.queryComponents = function(componentTypes) {
@ -23347,6 +23352,37 @@ GameLib.EntityManager.prototype.queryComponents = function(componentTypes) {
return result;
};
/**
* Slower way of retrieving objects
* @param constructors (array of constructors, or a constructor)
* @returns {*}
*/
GameLib.EntityManager.prototype.queryComponentsByConstructor = function(constructors) {
return Object.keys(this.idRegister).reduce(
function(result, componentId) {
if (constructors instanceof Array) {
constructors.map(
function(constructor) {
if (this.idRegister[componentId] instanceof constructor) {
result.push(this.idRegister[componentId]);
}
}.bind(this)
)
} else {
if (this.idRegister[componentId] instanceof constructors) {
result.push(this.idRegister[componentId]);
}
}
return result;
}.bind(this),
[]
);
};
/**
* Converts a GameLib.Entity to GameLib.API.Entity
* @returns {GameLib.API.EntityManager}
@ -26888,7 +26924,9 @@ GameLib.System.GUI.prototype.buildParentSelectionControl = function(folder, comp
var componentType = GameLib.Component[type];
var options = GameLib.EntityManager.Instance.queryComponents(componentType).reduce(
var constructor = GameLib.Component.GetComponentConstructor(componentType);
var options = GameLib.EntityManager.Instance.queryComponentsByConstructor(constructor).reduce(
function(result, object) {
result[object.name] = object;
return result;
@ -27111,19 +27149,19 @@ GameLib.System.GUI.prototype.buildSelectControl = function(folder, componentTemp
/**
* We need to discover the constructor for this component
*/
var constructor = null;
var constructors = null;
if (componentTemplate.template[property]) {
constructor = componentTemplate.template[property].constructor;
constructors = componentTemplate.template[property].constructor;
} else {
if (componentTemplate.template.linkedObjects[property]) {
constructor = componentTemplate.template.linkedObjects[property];
constructors = componentTemplate.template.linkedObjects[property];
}
}
var object = componentTemplate.template;
var objects = GameLib.EntityManager.Instance.queryComponents(constructor);
var objects = GameLib.EntityManager.Instance.queryComponentsByConstructor(constructors);
var idObject = {};
@ -29113,7 +29151,7 @@ GameLib.System.Input.prototype.onKeyDown = function(event) {
if (event.code === 'Delete') {
meshes = GameLib.EntityManager.Instance.queryComponents([GameLib.Component.MESH]);
meshes = GameLib.EntityManager.Instance.queryComponentsByConstructor(GameLib.D3.Mesh);
var deletedMeshes = [];
@ -29149,7 +29187,7 @@ GameLib.System.Input.prototype.onKeyDown = function(event) {
this.selectAll = !this.selectAll;
meshes = GameLib.EntityManager.Instance.queryComponents([GameLib.Component.MESH]);
meshes = GameLib.EntityManager.Instance.queryComponentsByConstructor(GameLib.D3.Mesh);
meshes.map(function(mesh){
if (this.selectAll) {
@ -30220,10 +30258,11 @@ GameLib.System.Linking.prototype.instanceCreated = function(data) {
/**
* Check ALL components for 'parentScenes' - this is expensive so it checks the register directly
*/
GameLib.EntityManager.Instance.register.map(
function(component) {
if (component.parentScene === data.component.id) {
component.parentScene = data.component;
Object.keys(GameLib.EntityManager.Instance.idRegister).map(
function(componentId) {
if (GameLib.EntityManager.Instance.idRegister[componentId].parentScene === data.component.id) {
GameLib.EntityManager.Instance.idRegister[componentId].parentScene = data.component;
}
}
);
@ -30266,22 +30305,21 @@ GameLib.System.Linking.prototype.instanceCreated = function(data) {
* Also - it inspects the register directly instead of querying it twice (since it checks ALL components)
*/
if (!data.preventParentMeshCheck) {
GameLib.EntityManager.Instance.register.map(
function (component) {
if (component.parentMesh &&
component.parentMesh === data.component.id ) {
component.parentMesh = data.component;
Object.keys(GameLib.EntityManager.Instance.idRegister).map(
function(componentId) {
if (GameLib.EntityManager.Instance.idRegister[componentId].parentMesh === data.component.id) {
GameLib.EntityManager.Instance.idRegister[componentId].parentMesh = data.component;
}
/**
* Check if a component has this mesh as a parent
*/
if (component instanceof GameLib.D3.Mesh) {
component.setParentMesh(data.component);
}
if (GameLib.EntityManager.Instance.idRegister[componentId] instanceof GameLib.D3.Mesh) {
GameLib.EntityManager.Instance.idRegister[componentId].setParentMesh(data.component);
}
}
);
}
}

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

@ -285,6 +285,7 @@ GameLib.Component.PARTICLE = 0x54;
GameLib.Component.AUDIO = 0x55;
GameLib.Component.SYSTEM_AUDIO = 0x56;
GameLib.Component.CAST = 0x57;
GameLib.Component.MAX_COMPONENTS = 0x58;
GameLib.Component.GRAPHICS_RUNTIME = 0x1;
GameLib.Component.PHYSICS_RUNTIME = 0x2;
@ -294,8 +295,11 @@ GameLib.Component.DEFAULT_RUNTIME = 0x5;
GameLib.Component.GUI_RUNTIME = 0x6;
GameLib.Component.CODER_RUNTIME = 0x7;
GameLib.Component.GetCompentType = function(constructor) {
console.log('todo: implement?');
GameLib.Component.GetCompentTypes = function(constructor) {
if (constructor === GameLib.Component) {
}
};
/**

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

@ -285,7 +285,8 @@ GameLib.EntityManager.prototype.findEntities = function(components) {
/**
* Returns all actual components of all entities that contain this component
* @param componentTypes (array of constructor or just a single constructor)
* More efficient
* @param componentTypes (array of component types or a single component type)
*/
GameLib.EntityManager.prototype.queryComponents = function(componentTypes) {
@ -312,6 +313,37 @@ GameLib.EntityManager.prototype.queryComponents = function(componentTypes) {
return result;
};
/**
* Slower way of retrieving objects
* @param constructors (array of constructors, or a constructor)
* @returns {*}
*/
GameLib.EntityManager.prototype.queryComponentsByConstructor = function(constructors) {
return Object.keys(this.idRegister).reduce(
function(result, componentId) {
if (constructors instanceof Array) {
constructors.map(
function(constructor) {
if (this.idRegister[componentId] instanceof constructor) {
result.push(this.idRegister[componentId]);
}
}.bind(this)
)
} else {
if (this.idRegister[componentId] instanceof constructors) {
result.push(this.idRegister[componentId]);
}
}
return result;
}.bind(this),
[]
);
};
/**
* Converts a GameLib.Entity to GameLib.API.Entity
* @returns {GameLib.API.EntityManager}

12
src/game-lib-system-gui.js
View File

@ -384,7 +384,9 @@ GameLib.System.GUI.prototype.buildParentSelectionControl = function(folder, comp
var componentType = GameLib.Component[type];
var options = GameLib.EntityManager.Instance.queryComponents(componentType).reduce(
var constructor = GameLib.Component.GetComponentConstructor(componentType);
var options = GameLib.EntityManager.Instance.queryComponentsByConstructor(constructor).reduce(
function(result, object) {
result[object.name] = object;
return result;
@ -607,19 +609,19 @@ GameLib.System.GUI.prototype.buildSelectControl = function(folder, componentTemp
/**
* We need to discover the constructor for this component
*/
var constructor = null;
var constructors = null;
if (componentTemplate.template[property]) {
constructor = componentTemplate.template[property].constructor;
constructors = componentTemplate.template[property].constructor;
} else {
if (componentTemplate.template.linkedObjects[property]) {
constructor = componentTemplate.template.linkedObjects[property];
constructors = componentTemplate.template.linkedObjects[property];
}
}
var object = componentTemplate.template;
var objects = GameLib.EntityManager.Instance.queryComponents(constructor);
var objects = GameLib.EntityManager.Instance.queryComponentsByConstructor(constructors);
var idObject = {};

4
src/game-lib-system-input.js
View File

@ -756,7 +756,7 @@ GameLib.System.Input.prototype.onKeyDown = function(event) {
if (event.code === 'Delete') {
meshes = GameLib.EntityManager.Instance.queryComponents([GameLib.Component.MESH]);
meshes = GameLib.EntityManager.Instance.queryComponentsByConstructor(GameLib.D3.Mesh);
var deletedMeshes = [];
@ -792,7 +792,7 @@ GameLib.System.Input.prototype.onKeyDown = function(event) {
this.selectAll = !this.selectAll;
meshes = GameLib.EntityManager.Instance.queryComponents([GameLib.Component.MESH]);
meshes = GameLib.EntityManager.Instance.queryComponentsByConstructor(GameLib.D3.Mesh);
meshes.map(function(mesh){
if (this.selectAll) {

26
src/game-lib-system-linking.js
View File

@ -606,10 +606,11 @@ GameLib.System.Linking.prototype.instanceCreated = function(data) {
/**
* Check ALL components for 'parentScenes' - this is expensive so it checks the register directly
*/
GameLib.EntityManager.Instance.register.map(
function(component) {
if (component.parentScene === data.component.id) {
component.parentScene = data.component;
Object.keys(GameLib.EntityManager.Instance.idRegister).map(
function(componentId) {
if (GameLib.EntityManager.Instance.idRegister[componentId].parentScene === data.component.id) {
GameLib.EntityManager.Instance.idRegister[componentId].parentScene = data.component;
}
}
);
@ -652,22 +653,21 @@ GameLib.System.Linking.prototype.instanceCreated = function(data) {
* Also - it inspects the register directly instead of querying it twice (since it checks ALL components)
*/
if (!data.preventParentMeshCheck) {
GameLib.EntityManager.Instance.register.map(
function (component) {
if (component.parentMesh &&
component.parentMesh === data.component.id ) {
component.parentMesh = data.component;
Object.keys(GameLib.EntityManager.Instance.idRegister).map(
function(componentId) {
if (GameLib.EntityManager.Instance.idRegister[componentId].parentMesh === data.component.id) {
GameLib.EntityManager.Instance.idRegister[componentId].parentMesh = data.component;
}
/**
* Check if a component has this mesh as a parent
*/
if (component instanceof GameLib.D3.Mesh) {
component.setParentMesh(data.component);
}
if (GameLib.EntityManager.Instance.idRegister[componentId] instanceof GameLib.D3.Mesh) {
GameLib.EntityManager.Instance.idRegister[componentId].setParentMesh(data.component);
}
}
);
}
}