diff --git a/src/main/java/cactusServer/models/ObjectModelManager.java b/src/main/java/cactusServer/models/ObjectModelManager.java index 2e2ad01..11c0b09 100644 --- a/src/main/java/cactusServer/models/ObjectModelManager.java +++ b/src/main/java/cactusServer/models/ObjectModelManager.java @@ -13,8 +13,8 @@ private ObjectModelManager() { try { - setObject(0, ModelFactory.loadModel(getClass().getResource("../../pocha.stl").getPath())); - setObject(1, ModelFactory.loadModel(getClass().getResource("../../pocha.stl").getPath())); + setObject(0, ModelFactory.loadModel(getClass().getResource("../../cube-binary.stl").getPath())); + setObject(1, ModelFactory.loadModel(getClass().getResource("../../cube-binary.stl").getPath())); } catch (IOException | ModelFileFormatException e) { e.printStackTrace(); } diff --git a/src/main/java/cactusServer/resources/ObjectsRest.java b/src/main/java/cactusServer/resources/ObjectsRest.java index 52c5bef..e0d6a70 100644 --- a/src/main/java/cactusServer/resources/ObjectsRest.java +++ b/src/main/java/cactusServer/resources/ObjectsRest.java @@ -42,7 +42,7 @@ // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String getObjects(@PathParam("instanceId") String instanceId) { - return JSON.encode(Instances.getInstance().getInstance(instanceId).getObjects()); + return JSON.encode(Instances.getInstance().getInstance(instanceId).getObjects()); } @POST diff --git a/src/main/resources/cube-ascii.stl b/src/main/resources/cube-ascii.stl new file mode 100644 index 0000000..a515291 --- /dev/null +++ b/src/main/resources/cube-ascii.stl @@ -0,0 +1,86 @@ +solid cube-ascii + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 0.000000e+00 0.000000e+00 1.000000e+01 + vertex 1.000000e+01 0.000000e+00 1.000000e+01 + vertex 0.000000e+00 1.000000e+01 1.000000e+01 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 1.000000e+00 + outer loop + vertex 1.000000e+01 1.000000e+01 1.000000e+01 + vertex 0.000000e+00 1.000000e+01 1.000000e+01 + vertex 1.000000e+01 0.000000e+00 1.000000e+01 + endloop + endfacet + facet normal 1.000000e+00 0.000000e+00 0.000000e+00 + outer loop + vertex 1.000000e+01 0.000000e+00 1.000000e+01 + vertex 1.000000e+01 0.000000e+00 0.000000e+00 + vertex 1.000000e+01 1.000000e+01 1.000000e+01 + endloop + endfacet + facet normal 1.000000e+00 0.000000e+00 0.000000e+00 + outer loop + vertex 1.000000e+01 1.000000e+01 0.000000e+00 + vertex 1.000000e+01 1.000000e+01 1.000000e+01 + vertex 1.000000e+01 0.000000e+00 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 1.000000e+01 0.000000e+00 0.000000e+00 + vertex 0.000000e+00 0.000000e+00 0.000000e+00 + vertex 1.000000e+01 1.000000e+01 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 0.000000e+00 -1.000000e+00 + outer loop + vertex 0.000000e+00 1.000000e+01 0.000000e+00 + vertex 1.000000e+01 1.000000e+01 0.000000e+00 + vertex 0.000000e+00 0.000000e+00 0.000000e+00 + endloop + endfacet + facet normal -1.000000e+00 0.000000e+00 0.000000e+00 + outer loop + vertex 0.000000e+00 0.000000e+00 0.000000e+00 + vertex 0.000000e+00 0.000000e+00 1.000000e+01 + vertex 0.000000e+00 1.000000e+01 0.000000e+00 + endloop + endfacet + facet normal -1.000000e+00 0.000000e+00 0.000000e+00 + outer loop + vertex 0.000000e+00 1.000000e+01 1.000000e+01 + vertex 0.000000e+00 1.000000e+01 0.000000e+00 + vertex 0.000000e+00 0.000000e+00 1.000000e+01 + endloop + endfacet + facet normal 0.000000e+00 1.000000e+00 0.000000e+00 + outer loop + vertex 0.000000e+00 1.000000e+01 1.000000e+01 + vertex 1.000000e+01 1.000000e+01 1.000000e+01 + vertex 0.000000e+00 1.000000e+01 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 1.000000e+00 0.000000e+00 + outer loop + vertex 1.000000e+01 1.000000e+01 0.000000e+00 + vertex 0.000000e+00 1.000000e+01 0.000000e+00 + vertex 1.000000e+01 1.000000e+01 1.000000e+01 + endloop + endfacet + facet normal 0.000000e+00 -1.000000e+00 0.000000e+00 + outer loop + vertex 1.000000e+01 0.000000e+00 1.000000e+01 + vertex 0.000000e+00 0.000000e+00 1.000000e+01 + vertex 1.000000e+01 0.000000e+00 0.000000e+00 + endloop + endfacet + facet normal 0.000000e+00 -1.000000e+00 0.000000e+00 + outer loop + vertex 0.000000e+00 0.000000e+00 0.000000e+00 + vertex 1.000000e+01 0.000000e+00 0.000000e+00 + vertex 0.000000e+00 0.000000e+00 1.000000e+01 + endloop + endfacet +endsolid diff --git a/src/main/resources/cube-binary.stl b/src/main/resources/cube-binary.stl new file mode 100644 index 0000000..ec39c0f --- /dev/null +++ b/src/main/resources/cube-binary.stl Binary files differ