some gui checks

beta.r3js.org
-=yb4f310 2017-06-04 18:17:16 +02:00
parent d7a6185e46
commit 8d481843fd
2 changed files with 25 additions and 4 deletions

View File

@ -308,6 +308,10 @@ GameLib.EntityManager.FromObjectEntityManager = function(graphics, objectEntityM
return entityManager; return entityManager;
}; };
/**
* Defines what should happen when a parent scene changes
* @param data
*/
GameLib.EntityManager.prototype.onParentSceneChange = function(data) { GameLib.EntityManager.prototype.onParentSceneChange = function(data) {
if (data.object instanceof GameLib.D3.Mesh) { if (data.object instanceof GameLib.D3.Mesh) {

View File

@ -774,8 +774,8 @@ GameLib.GUI.prototype.buildSelectControl = function(folder, object, property, en
/** /**
* Old way of doing things * Old way of doing things
*/ */
parentObject.buildIdToObject(); //parentObject.buildIdToObject();
object.updateInstance(); //object.updateInstance();
} }
/** /**
@ -886,20 +886,37 @@ GameLib.GUI.prototype.build = function(entityManager) {
}.bind(this) }.bind(this)
); );
discoveredObjects.sort(
function(a, b) {
if (a.name > b.name) {
return 1;
}
if (a.name < b.name) {
return -1;
}
return 0;
}
);
discoveredObjects.map( discoveredObjects.map(
function(object) { function(object) {
var apiObject = object.toApiObject(); var apiObject = object.toApiObject();
if (typeof(apiObject) === 'string') {
return;
}
var folder = null; var folder = null;
try { try {
folder = this.instance.addFolder(apiObject.name); folder = this.instance.addFolder(apiObject.name);
} catch (e) { } catch (e) {
console.log(e.message); console.log(e.message);
apiObject.name += GameLib.Utils.RandomId(3); return;
folder = this.instance.addFolder(apiObject.name);
} }
if (!folder) { if (!folder) {