Commit b1a84803 authored by Florian Hölzl's avatar Florian Hölzl

renamed plugin

refs 881
parent e8901f0a
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.fortiss.tooling.graphics3D.ui</name>
<name>org.fortiss.tooling.graphicsGL.ui</name>
<comment></comment>
<projects>
</projects>
......
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Fortiss Tooling Graphics 3D UI
Bundle-SymbolicName: org.fortiss.tooling.graphics3D.ui;singleton:=true
Bundle-Name: Fortiss Tooling Graphics GL UI
Bundle-SymbolicName: org.fortiss.tooling.graphicsGL.ui;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Activator: org.fortiss.tooling.graphics3D.ui.ToolingGraphics3DUIActivator
Require-Bundle: org.fortiss.tooling.graphics3D;bundle-version="2.1.0";visibility:=reexport,
Bundle-Activator: org.fortiss.tooling.graphicsGL.ui.ToolingGraphicsGLUIActivator
Require-Bundle: org.fortiss.tooling.graphicsGL;bundle-version="2.1.0";visibility:=reexport,
org.fortiss.tooling.base.ui;bundle-version="2.1.0";visibility:=reexport,
org.lwjgl;bundle-version="2.8.4";visibility:=reexport,
org.fortiss.af3.expression.ui;bundle-version="2.1.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: fortiss GmbH
Export-Package: org.fortiss.tooling.graphics3D.ui,
org.fortiss.tooling.graphics3D.ui.camera,
org.fortiss.tooling.graphics3D.ui.draw,
org.fortiss.tooling.graphics3D.ui.editor,
org.fortiss.tooling.graphics3D.ui.light,
org.fortiss.tooling.graphics3D.ui.objects,
org.fortiss.tooling.graphics3D.ui.picker,
org.fortiss.tooling.graphics3D.ui.util,
Export-Package: org.fortiss.tooling.graphicsGL.ui,
org.fortiss.tooling.graphicsGL.ui.camera,
org.fortiss.tooling.graphicsGL.ui.draw,
org.fortiss.tooling.graphicsGL.ui.editor,
org.fortiss.tooling.graphicsGL.ui.light,
org.fortiss.tooling.graphicsGL.ui.objects,
org.fortiss.tooling.graphicsGL.ui.picker,
org.fortiss.tooling.graphicsGL.ui.util,
org.newdawn.slick,
org.newdawn.slick.loading,
org.newdawn.slick.openal,
......
......@@ -11,7 +11,7 @@
<extension
point="org.fortiss.tooling.kernel.ui.modelEditorBinding">
<modelEditorBinding
binding="test.org.fortiss.tooling.graphics3D.ui.Test3DEditorBinding">
binding="test.org.fortiss.tooling.graphicsGL.ui.Test3DEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.expression.model.DataDictionary">
</modelElementClass>
......
......@@ -15,7 +15,7 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui;
package org.fortiss.tooling.graphicsGL.ui;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.plugin.AbstractUIPlugin;
......@@ -29,14 +29,14 @@ import org.osgi.framework.BundleContext;
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: E9B79759E2C0C013BE2B19DE87749838
*/
public class ToolingGraphics3DUIActivator extends AbstractUIPlugin {
public class ToolingGraphicsGLUIActivator extends AbstractUIPlugin {
/** The plug-in ID. */
public static final String PLUGIN_ID = ToolingGraphics3DUIActivator.class.getPackage()
public static final String PLUGIN_ID = ToolingGraphicsGLUIActivator.class.getPackage()
.getName(); //$NON-NLS-1$
/** The shared instance. */
private static ToolingGraphics3DUIActivator plugin;
private static ToolingGraphicsGLUIActivator plugin;
/** {@inheritDoc} */
@Override
......@@ -53,7 +53,7 @@ public class ToolingGraphics3DUIActivator extends AbstractUIPlugin {
}
/** Returns the shared instance. */
public static ToolingGraphics3DUIActivator getDefault() {
public static ToolingGraphicsGLUIActivator getDefault() {
return plugin;
}
......
......@@ -15,7 +15,7 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.camera;
package org.fortiss.tooling.graphicsGL.ui.camera;
import static org.lwjgl.util.glu.GLU.gluLookAt;
......
......@@ -15,15 +15,15 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.camera;
package org.fortiss.tooling.graphicsGL.ui.camera;
import static java.lang.Math.cos;
import static java.lang.Math.sin;
import static java.lang.Math.toRadians;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.X_UNIT_VECTOR;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.Z_UNIT_VECTOR;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.rotate;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.translate;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.X_UNIT_VECTOR;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.Z_UNIT_VECTOR;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.rotate;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.translate;
import static org.lwjgl.util.glu.GLU.gluLookAt;
/**
......
......@@ -15,9 +15,9 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.draw;
package org.fortiss.tooling.graphicsGL.ui.draw;
import static org.fortiss.tooling.graphics3D.ui.ToolingGraphics3DUIActivator.getDefault;
import static org.fortiss.tooling.graphicsGL.ui.ToolingGraphicsGLUIActivator.getDefault;
import static org.fortiss.tooling.kernel.utils.LoggingUtils.error;
import static org.lwjgl.opengl.GL11.GL_MODELVIEW;
import static org.lwjgl.opengl.GL11.GL_PROJECTION;
......
......@@ -15,7 +15,7 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.draw;
package org.fortiss.tooling.graphicsGL.ui.draw;
import static org.eclipse.ui.PlatformUI.getWorkbench;
......
......@@ -15,7 +15,7 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.editor;
package org.fortiss.tooling.graphicsGL.ui.editor;
import org.eclipse.jface.action.ContributionItem;
import org.eclipse.jface.action.StatusLineLayoutData;
......
......@@ -15,11 +15,11 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.editor;
package org.fortiss.tooling.graphicsGL.ui.editor;
import static org.fortiss.tooling.graphics3D.ui.ToolingGraphics3DUIActivator.getDefault;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.clearCanvasAndLoadIdentity;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.initializeGL;
import static org.fortiss.tooling.graphicsGL.ui.ToolingGraphicsGLUIActivator.getDefault;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.clearCanvasAndLoadIdentity;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.initializeGL;
import static org.fortiss.tooling.kernel.utils.LoggingUtils.error;
import static org.newdawn.slick.Color.black;
......@@ -38,11 +38,11 @@ import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.fortiss.tooling.graphics3D.ui.camera.Camera;
import org.fortiss.tooling.graphics3D.ui.draw.Lwjgl3DCanvas;
import org.fortiss.tooling.graphics3D.ui.draw.Lwjgl3DRenderThread;
import org.fortiss.tooling.graphics3D.ui.objects.ViewObjectBase;
import org.fortiss.tooling.graphics3D.ui.picker.ModelObjectPicker;
import org.fortiss.tooling.graphicsGL.ui.camera.Camera;
import org.fortiss.tooling.graphicsGL.ui.draw.Lwjgl3DCanvas;
import org.fortiss.tooling.graphicsGL.ui.draw.Lwjgl3DRenderThread;
import org.fortiss.tooling.graphicsGL.ui.objects.ViewObjectBase;
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;
......
......@@ -15,10 +15,10 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.light;
package org.fortiss.tooling.graphicsGL.ui.light;
import static org.fortiss.tooling.graphics3D.ui.util.FloatBufferUtils.toFloatBuffer;
import static org.fortiss.tooling.graphics3D.util.Graphics3DModelElementFactory.color;
import static org.fortiss.tooling.graphicsGL.ui.util.FloatBufferUtils.toFloatBuffer;
import static org.fortiss.tooling.graphicsGL.util.Graphics3DModelElementFactory.color;
import static org.lwjgl.opengl.GL11.GL_DIFFUSE;
import static org.lwjgl.opengl.GL11.GL_LIGHT0;
import static org.lwjgl.opengl.GL11.GL_POSITION;
......@@ -29,7 +29,7 @@ import static org.lwjgl.opengl.GL11.glLight;
import java.nio.FloatBuffer;
import org.fortiss.tooling.graphics3D.model.Color3D;
import org.fortiss.tooling.graphicsGL.model.Color3D;
/**
* Class representing a light source. It is initialized with a GL light number (GL_LIGHT0, ...,
......
......@@ -15,12 +15,12 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.light;
package org.fortiss.tooling.graphicsGL.ui.light;
import static org.lwjgl.opengl.GL11.glDisable;
import org.fortiss.tooling.graphics3D.model.scene.Light3D;
import org.fortiss.tooling.graphics3D.ui.util.GLPrimitives;
import org.fortiss.tooling.graphicsGL.model.scene.Light3D;
import org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives;
/**
* Class representing a light source based on the model object of class {@link Light3D}.
......
......@@ -15,12 +15,12 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.objects;
package org.fortiss.tooling.graphicsGL.ui.objects;
import java.util.ArrayList;
import java.util.List;
import org.fortiss.tooling.graphics3D.ui.picker.ModelObjectPicker;
import org.fortiss.tooling.graphicsGL.ui.picker.ModelObjectPicker;
/**
* Composite for {@link ViewObjectBase model objects} forwarding rendering and picking calls to
......
......@@ -15,26 +15,26 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.objects;
package org.fortiss.tooling.graphicsGL.ui.objects;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.drawLine;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.flushName;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.moveTo;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.prepareName;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.restoreMatrix;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.saveMatrix;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.setColor;
import static org.fortiss.tooling.graphics3D.util.Graphics3DModelElementFactory.RED;
import static org.fortiss.tooling.graphics3D.util.Graphics3DModelElementFactory.WHITE;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.drawLine;
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.prepareName;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.restoreMatrix;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.saveMatrix;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.setColor;
import static org.fortiss.tooling.graphicsGL.util.Graphics3DModelElementFactory.RED;
import static org.fortiss.tooling.graphicsGL.util.Graphics3DModelElementFactory.WHITE;
import static org.lwjgl.util.glu.GLU.GLU_FILL;
import org.fortiss.tooling.graphics3D.model.Color3D;
import org.fortiss.tooling.graphics3D.model.graph.Axis3D;
import org.fortiss.tooling.graphics3D.model.graph.CoordinateSystem3D;
import org.fortiss.tooling.graphics3D.model.graph.Graph3D;
import org.fortiss.tooling.graphics3D.model.graph.GraphLine3D;
import org.fortiss.tooling.graphics3D.model.graph.GraphPoint3D;
import org.fortiss.tooling.graphics3D.ui.picker.ModelObjectPicker;
import org.fortiss.tooling.graphicsGL.model.Color3D;
import org.fortiss.tooling.graphicsGL.model.graph.Axis3D;
import org.fortiss.tooling.graphicsGL.model.graph.CoordinateSystem3D;
import org.fortiss.tooling.graphicsGL.model.graph.Graph3D;
import org.fortiss.tooling.graphicsGL.model.graph.GraphLine3D;
import org.fortiss.tooling.graphicsGL.model.graph.GraphPoint3D;
import org.fortiss.tooling.graphicsGL.ui.picker.ModelObjectPicker;
import org.lwjgl.util.glu.Sphere;
/**
......
......@@ -15,11 +15,11 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.objects;
package org.fortiss.tooling.graphicsGL.ui.objects;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.drawMaterialGroups;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.drawMaterialGroups;
import org.fortiss.tooling.graphics3D.model.scene.Object3D;
import org.fortiss.tooling.graphicsGL.model.scene.Object3D;
/**
* {@link ViewObjectBase} instance for {@link Object3D} models.
......
......@@ -15,12 +15,12 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.objects;
package org.fortiss.tooling.graphicsGL.ui.objects;
import static org.lwjgl.opengl.GL11.glPopName;
import static org.lwjgl.opengl.GL11.glPushName;
import org.fortiss.tooling.graphics3D.ui.picker.ModelObjectPicker;
import org.fortiss.tooling.graphicsGL.ui.picker.ModelObjectPicker;
/**
* Base class for {@link ViewObjectBase view objects}, which become pickable by the
......
......@@ -15,11 +15,11 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.objects;
package org.fortiss.tooling.graphicsGL.ui.objects;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.restoreMatrix;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.rotate;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.saveMatrix;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.restoreMatrix;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.rotate;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.saveMatrix;
import org.lwjgl.util.vector.Vector3f;
......
......@@ -15,11 +15,11 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.objects;
package org.fortiss.tooling.graphicsGL.ui.objects;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.restoreMatrix;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.saveMatrix;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.scale;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.restoreMatrix;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.saveMatrix;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.scale;
import org.lwjgl.util.vector.Vector3f;
......
......@@ -15,9 +15,9 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.objects;
package org.fortiss.tooling.graphicsGL.ui.objects;
import org.fortiss.tooling.graphics3D.ui.picker.ModelObjectPicker;
import org.fortiss.tooling.graphicsGL.ui.picker.ModelObjectPicker;
/**
* Base class for 3D view objects. View objects support two methods for rendering in view and in
......
......@@ -15,7 +15,7 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.objects;
package org.fortiss.tooling.graphicsGL.ui.objects;
/**
* View object that wraps another object and can provide pre- and post-processing.
......
......@@ -15,7 +15,7 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.picker;
package org.fortiss.tooling.graphicsGL.ui.picker;
import static org.lwjgl.BufferUtils.createIntBuffer;
import static org.lwjgl.opengl.GL11.GL_LIGHTING;
......@@ -41,8 +41,8 @@ import java.nio.IntBuffer;
import java.util.HashMap;
import java.util.Map;
import org.fortiss.tooling.graphics3D.ui.camera.Camera;
import org.fortiss.tooling.graphics3D.ui.objects.ViewObjectBase;
import org.fortiss.tooling.graphicsGL.ui.camera.Camera;
import org.fortiss.tooling.graphicsGL.ui.objects.ViewObjectBase;
import org.lwjgl.util.vector.Vector3f;
/**
......
......@@ -15,14 +15,14 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.util;
package org.fortiss.tooling.graphicsGL.ui.util;
import static org.lwjgl.BufferUtils.createFloatBuffer;
import java.nio.FloatBuffer;
import org.fortiss.tooling.graphics3D.model.Color3D;
import org.fortiss.tooling.graphics3D.model.Vector3D;
import org.fortiss.tooling.graphicsGL.model.Color3D;
import org.fortiss.tooling.graphicsGL.model.Vector3D;
/**
* Utility methods for handling {@link FloatBuffer} more easily.
......
......@@ -15,10 +15,10 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.graphics3D.ui.util;
package org.fortiss.tooling.graphicsGL.ui.util;
import static org.fortiss.tooling.graphics3D.ui.util.FloatBufferUtils.toFloatBuffer;
import static org.fortiss.tooling.graphics3D.util.Mesh3DModelElementFactory.DEFAULT_MATERIAL;
import static org.fortiss.tooling.graphicsGL.ui.util.FloatBufferUtils.toFloatBuffer;
import static org.fortiss.tooling.graphicsGL.util.Mesh3DModelElementFactory.DEFAULT_MATERIAL;
import static org.lwjgl.BufferUtils.createFloatBuffer;
import static org.lwjgl.opengl.GL11.GL_AMBIENT;
import static org.lwjgl.opengl.GL11.GL_AMBIENT_AND_DIFFUSE;
......@@ -73,15 +73,15 @@ import static org.lwjgl.opengl.GL11.glVertex3f;
import java.nio.FloatBuffer;
import java.util.List;
import org.fortiss.tooling.graphics3D.model.Color3D;
import org.fortiss.tooling.graphics3D.model.Vector3D;
import org.fortiss.tooling.graphics3D.model.mesh.Face3D;
import org.fortiss.tooling.graphics3D.model.mesh.Material3D;
import org.fortiss.tooling.graphics3D.model.mesh.MaterialGroup3D;
import org.fortiss.tooling.graphics3D.model.mesh.Normal3D;
import org.fortiss.tooling.graphics3D.model.mesh.Vertex3D;
import org.fortiss.tooling.graphics3D.model.scene.Light3D;
import org.fortiss.tooling.graphics3D.ui.picker.ModelObjectPicker;
import org.fortiss.tooling.graphicsGL.model.Color3D;
import org.fortiss.tooling.graphicsGL.model.Vector3D;
import org.fortiss.tooling.graphicsGL.model.mesh.Face3D;
import org.fortiss.tooling.graphicsGL.model.mesh.Material3D;
import org.fortiss.tooling.graphicsGL.model.mesh.MaterialGroup3D;
import org.fortiss.tooling.graphicsGL.model.mesh.Normal3D;
import org.fortiss.tooling.graphicsGL.model.mesh.Vertex3D;
import org.fortiss.tooling.graphicsGL.model.scene.Light3D;
import org.fortiss.tooling.graphicsGL.ui.picker.ModelObjectPicker;
import org.lwjgl.opengl.GL11;
import org.lwjgl.util.vector.Vector3f;
import org.lwjgl.util.vector.Vector4f;
......
......@@ -15,7 +15,7 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package test.org.fortiss.tooling.graphics3D.ui;
package test.org.fortiss.tooling.graphicsGL.ui;
import static org.eclipse.swt.SWT.ARROW_DOWN;
import static org.eclipse.swt.SWT.ARROW_LEFT;
......@@ -23,19 +23,19 @@ import static org.eclipse.swt.SWT.ARROW_RIGHT;
import static org.eclipse.swt.SWT.ARROW_UP;
import static org.eclipse.swt.SWT.PAGE_DOWN;
import static org.eclipse.swt.SWT.PAGE_UP;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.enableColorMaterial;
import static org.fortiss.tooling.graphics3D.ui.util.GLPrimitives.enableLighting;
import static org.fortiss.tooling.graphics3D.util.Graph3DModelElementFactory.axis;
import static org.fortiss.tooling.graphics3D.util.Graph3DModelElementFactory.coordSystem;
import static org.fortiss.tooling.graphics3D.util.Graph3DModelElementFactory.graph;
import static org.fortiss.tooling.graphics3D.util.Graph3DModelElementFactory.graphLine;
import static org.fortiss.tooling.graphics3D.util.Graph3DModelElementFactory.graphPoint;
import static org.fortiss.tooling.graphics3D.util.Graphics3DModelElementFactory.BLUE;
import static org.fortiss.tooling.graphics3D.util.Graphics3DModelElementFactory.GREEN;
import static org.fortiss.tooling.graphics3D.util.Graphics3DModelElementFactory.RED;
import static org.fortiss.tooling.graphics3D.util.Graphics3DModelElementFactory.WHITE;
import static org.fortiss.tooling.graphics3D.util.Graphics3DModelElementFactory.color;
import static org.fortiss.tooling.graphics3D.util.Scene3DModelElementFactory.light3D;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.enableColorMaterial;
import static org.fortiss.tooling.graphicsGL.ui.util.GLPrimitives.enableLighting;
import static org.fortiss.tooling.graphicsGL.util.Graph3DModelElementFactory.axis;
import static org.fortiss.tooling.graphicsGL.util.Graph3DModelElementFactory.coordSystem;
import static org.fortiss.tooling.graphicsGL.util.Graph3DModelElementFactory.graph;
import static org.fortiss.tooling.graphicsGL.util.Graph3DModelElementFactory.graphLine;
import static org.fortiss.tooling.graphicsGL.util.Graph3DModelElementFactory.graphPoint;
import static org.fortiss.tooling.graphicsGL.util.Graphics3DModelElementFactory.BLUE;
import static org.fortiss.tooling.graphicsGL.util.Graphics3DModelElementFactory.GREEN;
import static org.fortiss.tooling.graphicsGL.util.Graphics3DModelElementFactory.RED;
import static org.fortiss.tooling.graphicsGL.util.Graphics3DModelElementFactory.WHITE;
import static org.fortiss.tooling.graphicsGL.util.Graphics3DModelElementFactory.color;
import static org.fortiss.tooling.graphicsGL.util.Scene3DModelElementFactory.light3D;
import static org.lwjgl.opengl.GL11.GL_LIGHT0;
import static org.lwjgl.opengl.GL11.GL_LIGHT1;
import static org.lwjgl.opengl.GL11.GL_LIGHT2;
......@@ -46,18 +46,18 @@ import java.util.List;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.MouseEvent;
import org.fortiss.tooling.graphics3D.model.Color3D;
import org.fortiss.tooling.graphics3D.model.Vector3D;
import org.fortiss.tooling.graphics3D.model.graph.CoordinateSystem3D;
import org.fortiss.tooling.graphics3D.model.graph.Graph3D;
import org.fortiss.tooling.graphics3D.model.graph.GraphLine3D;
import org.fortiss.tooling.graphics3D.model.graph.GraphPoint3D;
import org.fortiss.tooling.graphics3D.ui.camera.Camera;
import org.fortiss.tooling.graphics3D.ui.camera.MovingCameraWithPitchAndYaw;
import org.fortiss.tooling.graphics3D.ui.editor.Graphical3DEditorBase;
import org.fortiss.tooling.graphics3D.ui.light.Light3DLight;
import org.fortiss.tooling.graphics3D.ui.objects.Graph3DViewObject;
import org.fortiss.tooling.graphics3D.ui.objects.ViewObjectBase;
import org.fortiss.tooling.graphicsGL.model.Color3D;
import org.fortiss.tooling.graphicsGL.model.Vector3D;
import org.fortiss.tooling.graphicsGL.model.graph.CoordinateSystem3D;
import org.fortiss.tooling.graphicsGL.model.graph.Graph3D;
import org.fortiss.tooling.graphicsGL.model.graph.GraphLine3D;
import org.fortiss.tooling.graphicsGL.model.graph.GraphPoint3D;
import org.fortiss.tooling.graphicsGL.ui.camera.Camera;
import org.fortiss.tooling.graphicsGL.ui.camera.MovingCameraWithPitchAndYaw;
import org.fortiss.tooling.graphicsGL.ui.editor.Graphical3DEditorBase;
import org.fortiss.tooling.graphicsGL.ui.light.Light3DLight;
import org.fortiss.tooling.graphicsGL.ui.objects.Graph3DViewObject;
import org.fortiss.tooling.graphicsGL.ui.objects.ViewObjectBase;
import org.fortiss.tooling.kernel.model.IProjectRootElement;
/**
......
......@@ -15,7 +15,7 @@ $Id$
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package test.org.fortiss.tooling.graphics3D.ui;
package test.org.fortiss.tooling.graphicsGL.ui;
import org.eclipse.ui.IEditorPart;
import org.fortiss.af3.expression.model.DataDictionary;
......
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Fortiss Tooling Graphics 3D
Bundle-SymbolicName: org.fortiss.tooling.graphics3D;singleton:=true
Bundle-Name: Fortiss Tooling Graphics GL
Bundle-SymbolicName: org.fortiss.tooling.graphicsGL;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: fortiss GmbH
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.fortiss.tooling.graphics3D.ToolingGraphics3DActivator
Bundle-Activator: org.fortiss.tooling.graphicsGL.ToolingGraphicsGLActivator
Require-Bundle: org.fortiss.af3.project
Export-Package: org.fortiss.tooling.graphics3D,
org.fortiss.tooling.graphics3D.model,
org.fortiss.tooling.graphics3D.model.graph,