diff --git a/src/main/java/cactusServer/models/StageManager.java b/src/main/java/cactusServer/models/StageManager.java deleted file mode 100644 index b32a379..0000000 --- a/src/main/java/cactusServer/models/StageManager.java +++ /dev/null @@ -1,44 +0,0 @@ -package cactusServer.models; - -import java.io.IOException; -import java.util.HashMap; - -import javax.inject.Singleton; - -import org.ntlab.radishforandroidstudio.framework.model3D.Model3D; -import org.ntlab.radishforandroidstudio.framework.model3D.ModelFactory; -import org.ntlab.radishforandroidstudio.framework.model3D.ModelFileFormatException; -import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; - -@Singleton -public class StageManager { - private static StageManager theInstance = null; - private HashMap model = new HashMap<>(); - - private StageManager() { - try { - setStage(0,ModelFactory.loadModel("/CactusServer/src/main/assets/konan/konan.stl")); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (ModelFileFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - public static StageManager getInstance() { - if (theInstance == null) { - theInstance = new StageManager(); - } - return theInstance; - } - - public void setStage(int key, Model3D model3d) { - model.put(key, model3d); - } - - public Model3D getStage(int stageID) { - return model.get(stageID); - } -} diff --git a/src/main/java/cactusServer/models/StageModelManager.java b/src/main/java/cactusServer/models/StageModelManager.java new file mode 100644 index 0000000..2eea941 --- /dev/null +++ b/src/main/java/cactusServer/models/StageModelManager.java @@ -0,0 +1,39 @@ +package cactusServer.models; + +import java.io.BufferedInputStream; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.HashMap; + +import javax.inject.Singleton; +import javax.servlet.ServletContext; + +import org.ntlab.radishforandroidstudio.framework.model3D.Model3D; +import org.ntlab.radishforandroidstudio.framework.model3D.ModelFactory; +import org.ntlab.radishforandroidstudio.framework.model3D.ModelFileFormatException; +import org.ntlab.radishforandroidstudio.framework.model3D.Object3D; + +@Singleton +public class StageModelManager { + private static StageModelManager theInstance = null; + private HashMap model = new HashMap<>(); + + private StageModelManager() { + + } + + public static StageModelManager getInstance() { + if (theInstance == null) { + theInstance = new StageModelManager(); + } + return theInstance; + } + + public void setStage(int key, Model3D model3d) { + model.put(key, model3d); + } + + public Model3D getStage(int stageID) { + return model.get(stageID); + } +} diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java index 0c6c9b8..d279698 100644 --- a/src/main/java/cactusServer/utils/App.java +++ b/src/main/java/cactusServer/utils/App.java @@ -7,13 +7,13 @@ import cactusServer.models.Accounts; import cactusServer.models.CharacterModelManager; -import cactusServer.models.StageManager; +import cactusServer.models.StageModelManager; @SuppressWarnings("unused") @ApplicationPath("/rest") public class App extends ResourceConfig { public App() { - StageManager.getInstance(); + StageModelManager.getInstance(); CharacterModelManager.getInstance(); Accounts.getInstance().createAcount("aaa", "bbb", "c"); System.out.println("pass");