diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Object.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Object.java index 27d741a..334e414 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Object.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Object.java @@ -90,7 +90,7 @@ } public void setModel(int modelID) { -// this.model = ObjectModelManager.getInstance().getObject(modelID); + this.model = ObjectModelManager.getInstance().getObject(modelID); } public static class Attribute { 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 f7afff7..1875a00 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 @@ -8,10 +8,11 @@ import java.util.HashMap; class ObjectModelManager { -// -// private static ObjectModelManager theInstance = null; -// private HashMap model = new HashMap<>(); -// + + private static ObjectModelManager theInstance = null; + private HashMap model = new HashMap<>(); + // TODO: 2018/10/23 ObjectModelManagerの記述 + // private ObjectModelManager() { // try { // setObject(0, ModelFactory.loadModel(getClass().getResource("../../pocha.stl").getPath())); @@ -20,23 +21,23 @@ // e.printStackTrace(); // } // } -// -// public static ObjectModelManager getInstance() { -// if (theInstance == null) { -// theInstance = new ObjectModelManager(); -// } -// return theInstance; -// } -// -// public void setObject(int key, Model3D loadModel) { -// model.put(key, loadModel); -// } -// -// public Model3D getObject(int objectID) { -// return model.get(objectID); -// } -// -// public int getObjectModelCount() { -// return model.size(); -// } + + public static ObjectModelManager getInstance() { + if (theInstance == null) { + theInstance = new ObjectModelManager(); + } + return theInstance; + } + + public void setObject(int key, Model3D loadModel) { + model.put(key, loadModel); + } + + public Model3D getObject(int objectID) { + return model.get(objectID); + } + + public int getObjectModelCount() { + return model.size(); + } }