From e1a33dc44cf0104a40e8d8f6c8d68c8274b67dc5 Mon Sep 17 00:00:00 2001
From: Johannes Eder <eder@fortiss.org>
Date: Thu, 21 Feb 2013 09:10:55 +0000
Subject: [PATCH] new efficient deployment parameter
---
.../tooling/graphicsGL/ui/editor/Graphical3DEditorBase.java | 2 +-
.../tooling/graphicsGL/ui/objects/Graph3DViewObject.java | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
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 af9ee94fa..83c047263 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
@@ -160,7 +160,7 @@ public abstract class Graphical3DEditorBase<T extends EObject> extends EditorBas
/** Performs the object rendering operation. */
private void performRendering() throws LWJGLException {
- clearCanvasAndLoadIdentity(new Color(0.9f, 0.9f, 0.9f, 1.0f));
+ clearCanvasAndLoadIdentity(new Color(0.95f, 0.95f, 0.95f, 1.0f));
getCamera().applyForRendering();
beginRenderLoop();
getSceneModelObject().renderObject(getCamera());
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 b6a5b5bd4..bc81ec96b 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
@@ -17,12 +17,12 @@ $Id$
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphicsGL.ui.objects;
-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;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.flushName;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.moveTo;
+import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.multiplyCurrentMatrixWith;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.normalize;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.prepareName;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.restoreMatrix;
@@ -186,6 +186,8 @@ public class Graph3DViewObject extends ViewObjectBase {
// rotate text so it is readable from left to right
rotate(new Vector4f(0, 0, 1, -90));
+ GLPrimitives.scale(1.75f, 1.75f, 1.75f);
+
// draw the Text
for(Object3D o : objects) {
if(o != null)
@@ -219,6 +221,7 @@ public class Graph3DViewObject extends ViewObjectBase {
private void renderPoint(GraphPoint3D p) {
saveMatrix();
moveTo(p.getPosition());
+ GLPrimitives.scale(1.5f, 1.5f, 1.5f);
SPHERE.draw(0.2f, 9, 4);
restoreMatrix();
}
--
GitLab