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 319de5e21e8a28bafc60dc07ca707f15de6d31a5..34d194f5b905ae07d980e8c1392f730b11e1d3b6 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 3712170073c3e835663a1f06bfc5bad2c5dad920 RED +Graph3DViewObject.java 8b0f50b524b427c02ac00b4c0c76f7fafbace938 YELLOW 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 19a4c2a885c7c6d0eb100115d465d247a325b1d2..baa1d4d4bb69e72544d09056e424ff86c66ac622 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 @@ -77,6 +77,10 @@ public class Graph3DViewObject extends ViewObjectBase { HashMap<String, Object3D> characters; /** Hash map of all numbers which can be rendered */ HashMap<Integer, Object3D> numbers; + /** Scaling factor for text. */ + final float TEXT_SCALING_FACTOR = 1.75f; + /** Scaling factor for a sphere {@link GraphPoint3D} */ + float SCALING_FACTOR_POINT = 1.5f; /** Constructor. */ public Graph3DViewObject(Graph3D graph) { @@ -185,8 +189,7 @@ 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); + scale(TEXT_SCALING_FACTOR, TEXT_SCALING_FACTOR, TEXT_SCALING_FACTOR); // draw the Text for(Object3D o : objects) { @@ -221,10 +224,11 @@ 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); + scale(SCALING_FACTOR_POINT, SCALING_FACTOR_POINT, SCALING_FACTOR_POINT); + float radius = 0.2f; + int nrOfSlices = 9; + int nrOfStacks = 4; + SPHERE.draw(radius, nrOfSlices, nrOfStacks); restoreMatrix(); }