From cffd7d4103374e1c3dd2dc33bd6c7dd95911c388 Mon Sep 17 00:00:00 2001
From: Johannes Eder <eder@fortiss.org>
Date: Mon, 28 Jan 2013 08:14:36 +0000
Subject: [PATCH] YELLOW refs 1181
---
.../tooling/graphicsGL/ui/camera/Camera.java | 2 +-
.../camera/MovingCameraWithPitchAndYaw.java | 2 +-
.../graphicsGL/ui/draw/LwjglCanvas.java | 2 +-
.../ui/editor/Graphical3DEditorBase.java | 2 +-
.../tooling/graphicsGL/ui/light/Light.java | 2 +-
.../ui/objects/CompositeViewObject.java | 2 +-
.../ui/objects/Graph3DViewObject.java | 46 +------------------
.../ui/objects/Object3DViewObject.java | 2 +-
.../ui/objects/PickableObjectBase.java | 2 +-
.../graphicsGL/ui/objects/ViewObjectBase.java | 4 +-
.../ui/objects/WrappedViewObjectBase.java | 2 +-
.../ui/picker/ModelObjectPicker.java | 5 +-
.../graphicsGL/ui/util/GLPrimitives.java | 2 +-
.../graphicsGL/ui/util/Graph3DUtil.java | 2 +-
14 files changed, 18 insertions(+), 59 deletions(-)
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/camera/Camera.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/camera/Camera.java
index 2fac716d2..42ab06f77 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/camera/Camera.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/camera/Camera.java
@@ -27,7 +27,7 @@ import org.lwjgl.util.vector.Vector3f;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating GREEN Hash: 998BAAC6BD1F015C1E256B674C6E6B76
+ * @ConQAT.Rating YELLOW Hash: 3CB67C49CD0B0AE3D616631B07D7A996
*/
public class Camera {
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/camera/MovingCameraWithPitchAndYaw.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/camera/MovingCameraWithPitchAndYaw.java
index 2653ad895..203f8966e 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/camera/MovingCameraWithPitchAndYaw.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/camera/MovingCameraWithPitchAndYaw.java
@@ -35,7 +35,7 @@ import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.translate;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating GREEN Hash: 0238AF85DEA607611AB6693F9CD208A3
+ * @ConQAT.Rating YELLOW Hash: F5E252EE371670100BCCD8AD94596691
*/
public class MovingCameraWithPitchAndYaw extends Camera {
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/draw/LwjglCanvas.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/draw/LwjglCanvas.java
index 613f1eb3b..52f2a0156 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/draw/LwjglCanvas.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/draw/LwjglCanvas.java
@@ -48,7 +48,7 @@ import org.newdawn.slick.TrueTypeFont;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating GREEN Hash: 61FE0A90AF4880408879E8437691EF28
+ * @ConQAT.Rating YELLOW Hash: 280DA44F9786F1EAF19B32BF16C66DF3
*/
@SuppressWarnings("deprecation")
public class LwjglCanvas extends GLCanvas {
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/Graphical3DEditorBase.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/Graphical3DEditorBase.java
index 67eeecbaa..0c50441ea 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/Graphical3DEditorBase.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/editor/Graphical3DEditorBase.java
@@ -65,7 +65,7 @@ import org.newdawn.slick.Color;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating GREEN Hash: EEE9B97E767BE66D27E7493DEF5C56A5
+ * @ConQAT.Rating YELLOW Hash: A4F725C3CC3C4A92B7E9FB284FCEEBFE
*/
public abstract class Graphical3DEditorBase<T extends EObject> extends EditorBase<T> implements
MouseListener, MouseTrackListener, MouseMoveListener, MouseWheelListener, KeyListener,
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/light/Light.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/light/Light.java
index b38074c60..0f7a176de 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/light/Light.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/light/Light.java
@@ -37,7 +37,7 @@ import org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating GREEN Hash: 9EE133E0AEDEEFBBF419EE80512092FF
+ * @ConQAT.Rating YELLOW Hash: 400225B614C7EA5D83356F59808DE8F2
*/
public class Light {
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/CompositeViewObject.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/CompositeViewObject.java
index ac1e6c625..09b381f81 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/CompositeViewObject.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/CompositeViewObject.java
@@ -30,7 +30,7 @@ import org.fortiss.tooling.graphicsGL.ui.picker.ModelObjectPicker;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating GREEN Hash: 476D437455D7B282A443F1FFC4919435
+ * @ConQAT.Rating YELLOW Hash: 6DCD7467246F471C2693D3817A8FFBAE
*/
public class CompositeViewObject extends ViewObjectBase {
/** The component objects. */
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 49eb007b2..976cc6655 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
@@ -53,7 +53,6 @@ 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.fortiss.tooling.graphicsGL.util.Graph3DModelElementFactory;
import org.lwjgl.util.glu.Sphere;
import org.lwjgl.util.vector.Vector3f;
import org.lwjgl.util.vector.Vector4f;
@@ -64,7 +63,7 @@ import org.lwjgl.util.vector.Vector4f;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating GREEN Hash: 35C66DEC44CFCE044C427F14D4854E72
+ * @ConQAT.Rating YELLOW Hash: DE375F2B82F99AB5A242E8FEBF789030
*/
public class Graph3DViewObject extends ViewObjectBase {
/** The graph model. */
@@ -127,48 +126,10 @@ public class Graph3DViewObject extends ViewObjectBase {
renderText(c, t.getText(), convert(t.getPosition()));
}
- debug(c);
-
setColor(WHITE);
}
- private void debug(Camera c) {
- // for debugging
- // GLPrimitives.saveMatrix();
- // GLPrimitives.scale(0.5f, 0.5f, 0.5f);
- // setColor(Graphics3DModelElementFactory.RED);
- //
- // Vector3f up = ((MovingCameraWithPitchAndYaw)c).getCameraUp();
- // // up.x *= 4;
- // // up.y *= 4;
- // // up.z *= 4;
- //
- // drawLine(new Vector3f(0, 0, 0), up);
- // renderPoint(up);
- // renderText(c, "up", up);
- //
- // Vector3f right = ((MovingCameraWithPitchAndYaw)c).getCameraLookAt();
- // // right.x *= 4;
- // // right.y *= 4;
- // // right.z *= 4;
- //
- // setColor(Graphics3DModelElementFactory.GREEN);
- // drawLine(new Vector3f(0, 0, 0), right);
- // renderPoint(right);
- //
- // renderText(c, "lookAt", right);
- //
- // // Vector3f look = ((MovingCameraWithPitchAndYaw)c).getLookAt();
- // //
- // // setColor(Graphics3DModelElementFactory.BLUE);
- // // drawLine(new Vector3f(0, 0, 0), look);
- // // renderPoint(look);
- // GLPrimitives.scale(1.f, 1.f, 1.f);
- // GLPrimitives.restoreMatrix();
-
- }
-
/** Renders objects as billboards at the given position */
private void renderText(Camera camera, String string, Vector3f pos) {
List<Object3D> toRender = new ArrayList<Object3D>();
@@ -262,11 +223,6 @@ public class Graph3DViewObject extends ViewObjectBase {
restoreMatrix();
}
- /** Renders the given point. */
- private void renderPoint(Vector3f p) {
- renderPoint(Graph3DModelElementFactory.graphPoint(p.x, p.y, p.z));
- }
-
/** Renders the coordinate system if present. */
private void renderCoordSys(CoordinateSystem3D coordinateSystem) {
if(coordinateSystem != null) {
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/Object3DViewObject.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/Object3DViewObject.java
index cc043545b..405091540 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/Object3DViewObject.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/Object3DViewObject.java
@@ -28,7 +28,7 @@ import org.fortiss.tooling.graphicsGL.ui.camera.Camera;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating GREEN Hash: F115E006F4D287853C74F55E856501A5
+ * @ConQAT.Rating YELLOW Hash: 75621F5CEE7FFC25EF8148D3265580B5
*/
public class Object3DViewObject extends ViewObjectBase {
/** The model object. */
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/PickableObjectBase.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/PickableObjectBase.java
index 2c8df4534..3910bbfa1 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/PickableObjectBase.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/PickableObjectBase.java
@@ -32,7 +32,7 @@ import org.fortiss.tooling.graphicsGL.ui.picker.ModelObjectPicker;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating GREEN Hash: C4AACBAD612CE912E90497577BDA10E7
+ * @ConQAT.Rating YELLOW Hash: 972853B8021F08272208958BD892B21C
*/
public abstract class PickableObjectBase extends ViewObjectBase {
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/ViewObjectBase.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/ViewObjectBase.java
index 5f06e9c59..35421d0f8 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/ViewObjectBase.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/ViewObjectBase.java
@@ -27,7 +27,7 @@ import org.fortiss.tooling.graphicsGL.ui.picker.ModelObjectPicker;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating GREEN Hash: D36C3CD59FC6EA094E41BD4202B92F5D
+ * @ConQAT.Rating YELLOW Hash: 06D61D65EF0F290678EDEC5165385FEF
*/
public abstract class ViewObjectBase {
@@ -45,6 +45,8 @@ public abstract class ViewObjectBase {
*
* @param picker
* the picker requesting a picker rendering run
+ * @param c
+ * camera
*/
public void renderObjectForPicking(ModelObjectPicker picker, Camera c) {
// render nothing
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/WrappedViewObjectBase.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/WrappedViewObjectBase.java
index 420d25dda..95b1b0fea 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/WrappedViewObjectBase.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/objects/WrappedViewObjectBase.java
@@ -25,7 +25,7 @@ import org.fortiss.tooling.graphicsGL.ui.camera.Camera;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating GREEN Hash: E81444FC76B383C9805DDB821B49AF40
+ * @ConQAT.Rating YELLOW Hash: 330C687B00E0B485A4072030FE799214
*/
public abstract class WrappedViewObjectBase extends ViewObjectBase {
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/picker/ModelObjectPicker.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/picker/ModelObjectPicker.java
index ba6da24b1..cdbd01756 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/picker/ModelObjectPicker.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/picker/ModelObjectPicker.java
@@ -30,13 +30,14 @@ import org.lwjgl.util.vector.Vector3f;
/**
* Picker implementation for model objects using GL select mode rendering.
- * {@link #pickModelObject(int, int, Vector3f, ViewObjectBase)} returns the nearest object. All
+ * {@link #pickModelObject(int, int, Vector3f, ViewObjectBase, Camera)} returns the nearest object.
+ * All
* others are discarded.
*
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating GREEN Hash: DCFE2EBE3D7F33CDAF64A1980BE3165F
+ * @ConQAT.Rating YELLOW Hash: 084F7B53F4A07DC1C559303A9A5111FC
*/
public final class ModelObjectPicker {
/** The buffer size for pickable objects. */
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/GLPrimitives.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/GLPrimitives.java
index 811c47144..2fb977401 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/GLPrimitives.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/GLPrimitives.java
@@ -124,7 +124,7 @@ import org.newdawn.slick.Color;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 25892D6CA7A35E798D1B71AAEC81A964
+ * @ConQAT.Rating YELLOW Hash: E9089D8D84CEA770D57132032C307E69
*/
public class GLPrimitives {
/** The X unit vector. */
diff --git a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/Graph3DUtil.java b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/Graph3DUtil.java
index bcee36f1e..878f785ca 100644
--- a/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/Graph3DUtil.java
+++ b/org.fortiss.tooling.graphicsGL.ui/trunk/src/org/fortiss/tooling/graphicsGL/ui/util/Graph3DUtil.java
@@ -35,7 +35,7 @@ import org.lwjgl.util.vector.Vector3f;
* @author eder
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating RED Hash:
+ * @ConQAT.Rating YELLOW Hash: AC195C8F189BE3220349756D97B4297B
*/
public class Graph3DUtil {
--
GitLab