diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/.ratings b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/.ratings index 4a7d8eec3de6e17ad656a8e5ec605bdef32548f3..319de5e21e8a28bafc60dc07ca707f15de6d31a5 100644 --- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/.ratings +++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/.ratings @@ -1,2 +1,2 @@ -Graph3DViewObject.java c427f056f46f71175b180d490cd7f7d299156db2 YELLOW +Graph3DViewObject.java 3712170073c3e835663a1f06bfc5bad2c5dad920 RED ViewObjectBase.java 2fbcf09f17655c06abffaeb00dbc558e711404eb GREEN diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/Graph3DViewObject.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/Graph3DViewObject.java index 4c327532c2008ecd9714ac1368226910e02c5874..19a4c2a885c7c6d0eb100115d465d247a325b1d2 100644 --- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/Graph3DViewObject.java +++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/Graph3DViewObject.java @@ -28,6 +28,7 @@ import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.rotate; import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.saveMatrix; import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.scale; import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.setColor; +import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.translate; import static org.fortiss.tooling.graphicsGL.ui.util.Graph3DUtil.convert; import static org.fortiss.tooling.graphicsGL.ui.util.Graph3DUtil.importCharacters; import static org.fortiss.tooling.graphicsGL.ui.util.Graph3DUtil.importLetters; @@ -50,7 +51,6 @@ import org.fortiss.tooling.graphicsGL.model.graph.GraphText3D; import org.fortiss.tooling.graphicsGL.model.scene.Object3D; import org.fortiss.tooling.graphicsGL.ui.camera.Camera; import org.fortiss.tooling.graphicsGL.ui.picker.ModelObjectPicker; -import org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives; import org.lwjglx.util.glu.GLU; import org.lwjglx.util.glu.Sphere; import org.lwjglx.util.vector.Vector3f; @@ -146,8 +146,9 @@ public class Graph3DViewObject extends ViewObjectBase { } // if it is neither a letter, number, white space or "_" print a "?" if(renderObject == null) { - if(!st.equals(" ") && !st.equals("_")) + if(!st.equals(" ") && !st.equals("_")) { renderObject = this.characters.get("?"); + } } toRender.add(renderObject); } @@ -184,13 +185,15 @@ public class Graph3DViewObject extends ViewObjectBase { // rotate text so it is readable from left to right rotate(new Vector4f(0, 0, 1, -90)); + // TODO (SB, 14) scale(1.75f, 1.75f, 1.75f); // draw the Text for(Object3D o : objects) { - if(o != null) + if(o != null) { drawMaterialGroups(o.getMesh().getMaterialGroups()); - GLPrimitives.translate(0, DISTANCE_BEWTWEEN_LETTERS, 0); + } + translate(0, DISTANCE_BEWTWEEN_LETTERS, 0); } restoreMatrix(); @@ -218,7 +221,9 @@ public class Graph3DViewObject extends ViewObjectBase { private void renderPoint(GraphPoint3D p) { saveMatrix(); moveTo(p.getPosition()); + // TODO (SB, 14) scale(1.5f, 1.5f, 1.5f); + // TODO (SB, 14) SPHERE.draw(0.2f, 9, 4); restoreMatrix(); }