some gui checks
parent
d7a6185e46
commit
8d481843fd
|
@ -308,6 +308,10 @@ GameLib.EntityManager.FromObjectEntityManager = function(graphics, objectEntityM
|
|||
return entityManager;
|
||||
};
|
||||
|
||||
/**
|
||||
* Defines what should happen when a parent scene changes
|
||||
* @param data
|
||||
*/
|
||||
GameLib.EntityManager.prototype.onParentSceneChange = function(data) {
|
||||
|
||||
if (data.object instanceof GameLib.D3.Mesh) {
|
||||
|
|
|
@ -774,8 +774,8 @@ GameLib.GUI.prototype.buildSelectControl = function(folder, object, property, en
|
|||
/**
|
||||
* Old way of doing things
|
||||
*/
|
||||
parentObject.buildIdToObject();
|
||||
object.updateInstance();
|
||||
//parentObject.buildIdToObject();
|
||||
//object.updateInstance();
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -886,20 +886,37 @@ GameLib.GUI.prototype.build = function(entityManager) {
|
|||
}.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(
|
||||
|
||||
function(object) {
|
||||
|
||||
var apiObject = object.toApiObject();
|
||||
|
||||
if (typeof(apiObject) === 'string') {
|
||||
return;
|
||||
}
|
||||
|
||||
var folder = null;
|
||||
|
||||
try {
|
||||
folder = this.instance.addFolder(apiObject.name);
|
||||
} catch (e) {
|
||||
console.log(e.message);
|
||||
apiObject.name += GameLib.Utils.RandomId(3);
|
||||
folder = this.instance.addFolder(apiObject.name);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!folder) {
|
||||
|
|
Loading…
Reference in New Issue