diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MovableObjectModel.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MovableObjectModel.java index 4a96abf..e08f42d 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MovableObjectModel.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MovableObjectModel.java @@ -70,6 +70,8 @@ Map lastvisibleobject = new HashMap<>(visibleobject); visibleobject.clear(); JSON json = new JSON(); + + Map o = json.decode(response, new TypeReference>() { }); for (Map.Entry entry : o.entrySet()) { diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/ObjectModelManager.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/ObjectModelManager.java index e6f12ab..3465bde 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/ObjectModelManager.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/ObjectModelManager.java @@ -1,5 +1,6 @@ package org.ntlab.radishforandroidstudio.cactusClient.models; +import org.ntlab.radishforandroidstudio.framework.gameMain.RealTime3DFragment; import org.ntlab.radishforandroidstudio.framework.model3D.Model3D; import org.ntlab.radishforandroidstudio.framework.model3D.ModelFactory; import org.ntlab.radishforandroidstudio.framework.model3D.ModelFileFormatException; @@ -11,11 +12,14 @@ private static ObjectModelManager theInstance = null; private HashMap model = new HashMap<>(); + private RealTime3DFragment fragment; + // TODO: 2018/10/23 ObjectModelManagerの記述 private ObjectModelManager() { try { - setObject(0, ModelFactory.loadModel(null,getClass().getResource("../../pocha.stl").getPath())); - setObject(1, ModelFactory.loadModel(null,getClass().getResource("../../pocha.stl").getPath())); + setObject(0, ModelFactory.loadModel(fragment.getResources(),getClass().getResource("cube-ascii.stl").getPath())); + setObject(1, ModelFactory.loadModel(fragment.getResources(),getClass().getResource("cube-ascii.stl").getPath())); + } catch (IOException | ModelFileFormatException e) { e.printStackTrace(); }