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

No commit message

No commit message
parent 399f6fb5
No related branches found
No related tags found
No related merge requests found
......@@ -20,7 +20,6 @@ package org.fortiss.tooling.graphicsGL.ui.editor;
import static org.fortiss.tooling.graphicsGL.ui.ToolingGraphicsGLUIActivator.getDefault;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.clearCanvasAndLoadIdentity;
import static org.fortiss.tooling.kernel.utils.LoggingUtils.error;
import static org.newdawn.slick.Color.black;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.action.IStatusLineManager;
......@@ -34,6 +33,7 @@ import org.eclipse.swt.events.MouseTrackListener;
import org.eclipse.swt.events.MouseWheelListener;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
......@@ -45,6 +45,7 @@ import org.fortiss.tooling.graphicsGL.ui.picker.ModelObjectPicker;
import org.fortiss.tooling.kernel.ui.extension.base.EditorBase;
import org.lwjgl.LWJGLException;
import org.lwjgl.util.vector.Vector3f;
import org.newdawn.slick.Color;
/**
* Base class for 3D graphics editors. Sub-classes must provide a {@link Camera} and a
......@@ -159,7 +160,7 @@ public abstract class Graphical3DEditorBase<T extends EObject> extends EditorBas
/** Performs the object rendering operation. */
private void performRendering() throws LWJGLException {
clearCanvasAndLoadIdentity(black);
clearCanvasAndLoadIdentity(new Color(0.9f, 0.9f, 0.9f, 1.0f));
getCamera().applyForRendering();
beginRenderLoop();
getSceneModelObject().renderObject();
......@@ -175,6 +176,9 @@ public abstract class Graphical3DEditorBase<T extends EObject> extends EditorBas
Composite c = new Composite(parent, SWT.NONE);
c.setLayout(new FillLayout());
GridData gd = new GridData(GridData.FILL, GridData.FILL, true, true);
c.setLayoutData(gd);
canvas = new LwjglCanvas(c);
canvas.addResizeHandler(this);
canvas.addMouseListener(this);
......
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