aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ardor3d-examples/build.gradle1
-rw-r--r--ardor3d-examples/pom.xml5
-rw-r--r--ardor3d-jogl-awt/build.gradle7
-rw-r--r--ardor3d-jogl-awt/pom.xml32
-rw-r--r--ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/JoglAwtCanvas.java (renamed from ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglAwtCanvas.java)0
-rw-r--r--ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/JoglAwtInitializerRunnable.java (renamed from ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglAwtInitializerRunnable.java)0
-rw-r--r--ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/JoglCanvas.java (renamed from ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglCanvas.java)0
-rw-r--r--ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/JoglNewtAwtCanvas.java (renamed from ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglNewtAwtCanvas.java)0
-rw-r--r--ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/JoglSwingCanvas.java (renamed from ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglSwingCanvas.java)0
-rw-r--r--ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/JoglSwingInitializerRunnable.java (renamed from ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglSwingInitializerRunnable.java)0
-rw-r--r--pom.xml1
-rw-r--r--settings.gradle2
12 files changed, 48 insertions, 0 deletions
diff --git a/ardor3d-examples/build.gradle b/ardor3d-examples/build.gradle
index b04b03f..f07954b 100644
--- a/ardor3d-examples/build.gradle
+++ b/ardor3d-examples/build.gradle
@@ -5,6 +5,7 @@ dependencies {
compile project(':ardor3d-swt')
compile project(':ardor3d-jinput')
compile project(':ardor3d-jogl')
+ compile project(':ardor3d-jogl-awt')
compile project(':ardor3d-jogl-swt')
compile project(':ardor3d-effects')
compile project(':ardor3d-extras')
diff --git a/ardor3d-examples/pom.xml b/ardor3d-examples/pom.xml
index e4b71b3..7350176 100644
--- a/ardor3d-examples/pom.xml
+++ b/ardor3d-examples/pom.xml
@@ -127,6 +127,11 @@
<artifactId>ardor3d-jogl</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ardor3d-jogl-awt</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ardor3d-jogl-swt</artifactId>
diff --git a/ardor3d-jogl-awt/build.gradle b/ardor3d-jogl-awt/build.gradle
new file mode 100644
index 0000000..c443fa6
--- /dev/null
+++ b/ardor3d-jogl-awt/build.gradle
@@ -0,0 +1,7 @@
+
+description = 'Ardor 3D JOGL AWT'
+dependencies {
+ compile project(':ardor3d-core')
+ compile project(':ardor3d-awt')
+ compile project(':ardor3d-jogl')
+}
diff --git a/ardor3d-jogl-awt/pom.xml b/ardor3d-jogl-awt/pom.xml
new file mode 100644
index 0000000..d76a750
--- /dev/null
+++ b/ardor3d-jogl-awt/pom.xml
@@ -0,0 +1,32 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.ardor3d</groupId>
+ <artifactId>ardor3d</artifactId>
+ <relativePath>../pom.xml</relativePath>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>ardor3d-jogl-awt</artifactId>
+ <packaging>bundle</packaging>
+ <name>Ardor 3D JOGL AWT</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ardor3d-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ardor3d-awt</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ardor3d-jogl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglAwtCanvas.java b/ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/JoglAwtCanvas.java
index b4f2c3b..b4f2c3b 100644
--- a/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglAwtCanvas.java
+++ b/ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/JoglAwtCanvas.java
diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglAwtInitializerRunnable.java b/ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/JoglAwtInitializerRunnable.java
index 3a7153d..3a7153d 100644
--- a/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglAwtInitializerRunnable.java
+++ b/ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/JoglAwtInitializerRunnable.java
diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglCanvas.java b/ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/JoglCanvas.java
index 9874730..9874730 100644
--- a/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglCanvas.java
+++ b/ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/JoglCanvas.java
diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglNewtAwtCanvas.java b/ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/JoglNewtAwtCanvas.java
index ee195b8..ee195b8 100644
--- a/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglNewtAwtCanvas.java
+++ b/ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/JoglNewtAwtCanvas.java
diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglSwingCanvas.java b/ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/JoglSwingCanvas.java
index 45c2974..45c2974 100644
--- a/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglSwingCanvas.java
+++ b/ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/JoglSwingCanvas.java
diff --git a/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglSwingInitializerRunnable.java b/ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/JoglSwingInitializerRunnable.java
index c50039b..c50039b 100644
--- a/ardor3d-jogl/src/main/java/com/ardor3d/framework/jogl/JoglSwingInitializerRunnable.java
+++ b/ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/JoglSwingInitializerRunnable.java
diff --git a/pom.xml b/pom.xml
index 5c78c21..82b8368 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,7 @@
<module>ardor3d-swt</module>
<module>ardor3d-jogl-swt</module>
<module>ardor3d-awt</module>
+ <module>ardor3d-jogl-awt</module>
<module>ardor3d-extras</module>
<module>ardor3d-effects</module>
<module>ardor3d-collada</module>
diff --git a/settings.gradle b/settings.gradle
index da2b110..5838923 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,6 +7,7 @@ include ':ardor3d-jogl'
include ':ardor3d-swt'
include ':ardor3d-jogl-swt'
include ':ardor3d-awt'
+include ':ardor3d-jogl-awt'
include ':ardor3d-extras'
include ':ardor3d-effects'
include ':ardor3d-collada'
@@ -24,6 +25,7 @@ project(':ardor3d-jogl').projectDir = "$rootDir/ardor3d-jogl" as File
project(':ardor3d-swt').projectDir = "$rootDir/ardor3d-swt" as File
project(':ardor3d-jogl-swt').projectDir = "$rootDir/ardor3d-jogl-swt" as File
project(':ardor3d-awt').projectDir = "$rootDir/ardor3d-awt" as File
+project(':ardor3d-jogl-awt').projectDir = "$rootDir/ardor3d-jogl-awt" as File
project(':ardor3d-extras').projectDir = "$rootDir/ardor3d-extras" as File
project(':ardor3d-effects').projectDir = "$rootDir/ardor3d-effects" as File
project(':ardor3d-collada').projectDir = "$rootDir/ardor3d-collada" as File