Skip to content
Snippets Groups Projects
Commit bceba6c5 authored by Johannes Eder's avatar Johannes Eder
Browse files

YELLOW

refs 1181
parent c8d80e9c
No related branches found
No related tags found
No related merge requests found
......@@ -17,7 +17,7 @@ $Id$
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphicsGL.ui.objects;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.changeTransformationMatrix;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.multiplyCurrentMatrixWith;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.createBillboardMatrix;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.drawLine;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.drawMaterialGroups;
......@@ -63,7 +63,7 @@ import org.lwjgl.util.vector.Vector4f;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating GREEN Hash: 770C404FAB1788AF6DAEFA15534A76C0
* @ConQAT.Rating GREEN Hash: 4F814C9D447A9EDC93817AC56F19B453
*/
public class Graph3DViewObject extends ViewObjectBase {
/** The graph model. */
......@@ -181,7 +181,7 @@ public class Graph3DViewObject extends ViewObjectBase {
createBillboardMatrix(bbmat, right, up, look, pos);
// apply the billboard
changeTransformationMatrix(bbmat);
multiplyCurrentMatrixWith(bbmat);
// rotate text so it is readable from left to right
rotate(new Vector4f(0, 0, 1, -90));
......
......@@ -124,7 +124,7 @@ import org.newdawn.slick.Color;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: E9089D8D84CEA770D57132032C307E69
* @ConQAT.Rating YELLOW Hash: 00BCAA8DC4A037C043BB9F7047A69386
*/
public class GLPrimitives {
/** The X unit vector. */
......@@ -283,14 +283,12 @@ public class GLPrimitives {
}
/** Sets as new transformation matrix. */
// TODO (FH): method should be called "multiplyCurrentMatrixWith"
public static void changeTransformationMatrix(float[] floatBuffer) {
changeTransformationMatrix(toFloatBuffer(floatBuffer));
public static void multiplyCurrentMatrixWith(float[] floatBuffer) {
multiplyCurrentMatrixWith(toFloatBuffer(floatBuffer));
}
/** Sets as new transformation matrix. */
// TODO (FH): method should be called "multiplyCurrentMatrixWith"
public static void changeTransformationMatrix(FloatBuffer floatBuffer) {
private static void multiplyCurrentMatrixWith(FloatBuffer floatBuffer) {
glMultMatrix(floatBuffer);
}
......
......@@ -31,12 +31,12 @@ import org.fortiss.tooling.graphicsGL.util.OBJLoaderUtil;
import org.lwjgl.util.vector.Vector3f;
/**
* TODO (FH): missing class comment
* Util class for representing 3D Objects (letters, characters, numbers)
*
* @author eder
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: AC195C8F189BE3220349756D97B4297B
* @ConQAT.Rating YELLOW Hash: 744A70ED5288C0D13AE4FFEAB5FB6DDF
*/
public class Graph3DUtil {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment