7u83/OpenSeSim
1
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

So. Now we build our editor around a world object.

Browse Source 
Yes! We do!
This commit is contained in:
7u83
2018-12-04 20:04:12 +01:00
parent 03fbd9cd25
commit 160dcb6b21
12 changed files with 284 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/opensesim/gui/Globals.java
View File

@ -211,6 +211,11 @@ public class Globals {
static public ArrayList<Class<AbstractAsset>> getAvailableAssetsTypes(boolean sort) {
// if class_cache is not initialized return an empty list
if (class_cache == null){
return new ArrayList<>();
}
Collection<Class> asset_types_raw;
asset_types_raw = class_cache.getClassCollection(AbstractAsset.class);
@ -230,8 +235,8 @@ public class Globals {
try {
// a1 = o1.newInstance();
a1 = o1.getConstructor().newInstance();
a2 = o2.getConstructor().newInstance();
a1 = o1.getConstructor(World.class,JSONObject.class).newInstance(null,null);
a2 = o2.getConstructor(World.class,JSONObject.class).newInstance(null,null);
} catch (InstantiationException | IllegalAccessException | NoSuchMethodException | SecurityException | IllegalArgumentException | InvocationTargetException ex) {
Logger.getLogger(AssetEditorPanel.class.getName()).log(Level.SEVERE, null, ex);
return 0;