diff options
| -rw-r--r-- | README.md | 49 | ||||
| -rw-r--r-- | docs/GL2ES2PipelineUsageGuide.md (renamed from docs/GL2ES2Pipeline usage guide.md) | 0 | ||||
| -rw-r--r-- | src/main/java/org/jogamp/java3d/JoglPipeline.java | 14 |
3 files changed, 30 insertions, 33 deletions
@@ -11,7 +11,7 @@ The source code license information for this project is in LICENSE.txt Additional information and license restrictions for third party source
code are found in the THIRDPARTY-LICENSE-*.txt files.
-##Building Java3D
+## Building Java3D
The instructions below are based on eclipse, however they should work on most common IDE's
@@ -23,15 +23,15 @@ Expand the Maven group and select Existing Maven Project and click Next For Root directory click Browse and find the root folder that you cloned the repo into
There should be a pom.xml that is ticked in the Projects area
Click Finish
-Repeat for java3d-utils using
-https://github.com/philjord/java3d-utils.git
-Repeat for vecmath using
-https://github.com/philjord/vecmath.git
-
-Once that's done it's likely you'll need to
-Right click on pom.xml -> Run As -> Maven clean
-then
-Right click on pom.xml -> Run As -> Maven generate sources
+Repeat for java3d-utils using
+https://github.com/philjord/java3d-utils.git
+Repeat for vecmath using
+https://github.com/philjord/vecmath.git
+
+Once that's done it's likely you'll need to
+Right click on pom.xml -> Run As -> Maven clean
+then
+Right click on pom.xml -> Run As -> Maven generate sources
This should place a derived version of VersionInfo.java into /java3d-core/target/generated-sources/java-templates
@@ -43,31 +43,28 @@ org.jdesktop.j3d.examples.hello_universe.HelloUniverse.java Run as ... Java Application
You should see Java3D working
-##Documentation
+## Documentation
-###Javadocs
-.
-<http://download.java.net/media/java3d/javadoc/1.5.0/>
-or
-<https://github.com/scijava/java3d-javadoc>
-though neither is correctly up to date
+### Javadocs
-###Basic overview guide
+https://jogamp.org/wiki/index.php?title=Java3D_API_Documentation
+
+### Basic overview guide
For the best kick off point see [/docs/tutorial/](/docs/tutorial/)
For a description of performance see [/docs/perf_guide.txt](/docs/perf_guide.txt)
-Old Java3d project site with lots of information <https://java.net/projects/java3d>
+Old Java3d project site with lots of information <https://java.net/projects/java3d>
General technical tips <https://java.net/projects/java3d/pages/Java3DApplicationDev>
-Using the newer ES2/ES3 pipeline [/docs/GL2ES2Pipeline usage guide.md](/docs/GL2ES2Pipeline usage guide.md)
+Using the newer ES2/ES3 pipeline [/docs/GL2ES2PipelineUsageGuide.md](/docs/GL2ES2PipelineUsageGuide.md)
-###Tutorials
-.
+### Tutorials
+
<http://www.java3d.org/tutorial.html>
-###FAQ
-.
+### FAQ
+
<http://jogamp.org/wiki/index.php/Java3D_FAQ>
-###General assistance
+### General assistance
contact the forum at
-<http://forum.jogamp.org/>
\ No newline at end of file +<http://forum.jogamp.org/>
diff --git a/docs/GL2ES2Pipeline usage guide.md b/docs/GL2ES2PipelineUsageGuide.md index 41a9ee9..41a9ee9 100644 --- a/docs/GL2ES2Pipeline usage guide.md +++ b/docs/GL2ES2PipelineUsageGuide.md diff --git a/src/main/java/org/jogamp/java3d/JoglPipeline.java b/src/main/java/org/jogamp/java3d/JoglPipeline.java index a7a05c7..f386f0b 100644 --- a/src/main/java/org/jogamp/java3d/JoglPipeline.java +++ b/src/main/java/org/jogamp/java3d/JoglPipeline.java @@ -6545,13 +6545,6 @@ class JoglPipeline extends Pipeline { } else { - // TODO can't find an implementation which avoids the use of QueryCanvas - // JOGL requires a visible Frame for an onscreen context - Frame f = new Frame(); - Dialog d = new Dialog(f); - d.setUndecorated(true); - d.setLayout(new BorderLayout()); - ContextQuerier querier = new ContextQuerier(cv); AWTGraphicsConfiguration awtConfig = @@ -6559,6 +6552,13 @@ class JoglPipeline extends Pipeline { QueryCanvas canvas = new QueryCanvas(awtConfig, querier); + // TODO can't find an implementation which avoids the use of QueryCanvas + // JOGL requires a visible Frame for an onscreen context + Frame f = new Frame(canvas.getGraphicsConfiguration()); + Dialog d = new Dialog(f); + d.setUndecorated(true); + d.setLayout(new BorderLayout()); + d.add(canvas, BorderLayout.CENTER); d.setSize(MIN_FRAME_SIZE, MIN_FRAME_SIZE); d.setVisible(true); |