aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* gl2es2 pipeline deprecated layer had some non-deprecated methods in itphil2016-10-171-29/+0
|
* normalMatrix calculation was using cached values for VM that may notphil2016-10-161-1/+1
| | | have been up to date view and model matrixs now used
* Lighting data calculations improvedphil2016-10-163-19/+80
| | | | Positions are now correctly pre multiplied by MV, and the front material emmission value is sent through to the shaders, if requested
* GL2ES2Pipeline first cutphil2016-10-119-3/+9980
| | | | | | Examples of use can be found at https://github.com/philjord/java3d-examples/tree/master/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline
* Merge pull request #5 from scijava/templates-dirJulien Gouesse2015-12-022-3/+0
|\ | | | | Move Java templates to the conventional directory
| * Move Java templates to the conventional directoryCurtis Rueden2015-12-012-3/+0
|/ | | | | | | Maven's templating-maven-plugin normally wants Java templates in src/main/java-templates. They were placed in src/templates previously for consistency with the sources in src. But now that the sources have moved to the standard Maven location, let's move the templates, too.
* Merge pull request #4 from scijava/directory-structureJulien Gouesse2015-11-30449-0/+0
|\ | | | | Fix up the directory structure
| * Move javadoc files to standard Maven locationCurtis Rueden2015-11-3045-0/+0
| |
| * Move resources into src/main/resourcesCurtis Rueden2015-11-301-0/+0
| |
| * Unnest java3d foldersCurtis Rueden2015-11-30449-0/+0
|/ | | | | We want the package prefix to be org.jogamp.java3d, not org.jogamp.java3d.java3d.
* Adopts a more standard directory layout for MavenJulien Gouesse2015-11-28450-16/+3
|
* Documents the current API change (package relocation)Julien Gouesse2015-11-281-0/+6
|
* Relocate package prefix to org.jogamp.java3dJulien Gouesse2015-11-28450-756/+756
|
* Replaces jogl.version by jogamp.versionJulien Gouesse2015-11-281-3/+3
|
* Merge pull request #2 from scijava/mavenJulien Gouesse2015-11-277-1224/+248
|\ | | | | Build the project using Maven
| * Build the project using MavenCurtis Rueden2015-11-267-1224/+248
|/ | | | | | | | | | | | This introduces a pom.xml which tells Maven how the project is structured. To avoid a boatload of disruptive renames, we override some of Maven's default settings. It updates the code generation scheme to generate VersionInfo.java using the templating-maven-plugin. Lastly, it removes the Ant build files to avoid maintaining multiple build systems.
* Merge pull request #1 from scijava/circular-depsJulien Gouesse2015-11-263-25/+64
|\ | | | | Eliminate circular dependency between core & utils
| * Include META-INF directory in j3dutils.jarCurtis Rueden2015-11-251-2/+2
| | | | | | | | | | This is needed so that its GeometryService implementation can be discovered at runtime.
| * Font3D: use the GeometryService as appropriateCurtis Rueden2015-11-251-28/+15
| | | | | | | | | | | | | | | | | | This avoids a dependency on j3d-core-utils's com.sun.j3d.utils.geometry package. If j3d-core-utils is present on the classpath, it can provide the same backing implementation as before, but the option is now open to provide an alternative service implementation if desired. This addresses hharrison/java3d-core#17.
| * Add a service interface for external routinesCurtis Rueden2015-11-251-0/+40
| | | | | | | | | | | | | | | | In particular, Font3D's triangulateGlyphs routine relies on the classes GeometryInfo and NormalGenerator of package com.sun.j3d.utils.geometry, which lives in the j3d-core-utils project, under a different license. This means that historically, j3d-core and j3d-core-utils were mutually dependent. We avoid the situation by using a service interface instead.
| * Font3D: refactor island triangulation logicCurtis Rueden2015-10-061-17/+27
| | | | | | | | | | This moves the logic into a dedicated private method, which will be subsequently externalized into a service interface.
| * Font3D: declare local variables when they are usedCurtis Rueden2015-10-061-2/+2
| | | | | | | | This will ease subsequent refactoring.
| * Font3D: tweak whitespaceCurtis Rueden2015-10-061-1/+1
| |
| * Font3D: count points in a separate loopCurtis Rueden2015-10-061-1/+3
| | | | | | | | This makes the subsequent logic easier to refactor.
* | Uses JOGL 2.3.2, updates the Ant build scriptJulien Gouesse2015-11-191-2/+2
| |
* | Gets Harvey's changesJulien Gouesse2015-11-19452-458/+44
|\|
| * j3dcore: flatten the directory structure a bitHarvey Harrison2015-04-19449-3/+3
| | | | | | | | Signed-off-by: Harvey Harrison <[email protected]>
| * j3dcore: remove an old ant build file in the source treeHarvey Harrison2015-04-191-416/+0
| | | | | | | | Signed-off-by: Harvey Harrison <[email protected]>
| * build: remove separate generated manifest filesHarvey Harrison2015-04-192-24/+24
| | | | | | | | | | | | Put all the manifest information in the ant build file. Signed-off-by: Harvey Harrison <[email protected]>
| * j3dcore: update version to 1.6.0-pre121.6.0-pre12Harvey Harrison2015-04-191-1/+1
| | | | | | | | Signed-off-by: Harvey Harrison <[email protected]>
| * README: expand the build instructions to include the jogl jarsHarvey Harrison2015-04-192-5/+8
| | | | | | | | Signed-off-by: Harvey Harrison <[email protected]>
| * j3dcore: fix up compile to build with JOGL release 2.3.1Julien Gouesse2015-04-195-34/+34
| | | | | | | | | | Signed-off-by: Julien Gouesse <[email protected]> Signed-off-by: Harvey Harrison <[email protected]>
| * Fix the remote repository URLsCurtis Rueden2015-04-192-10/+9
| | | | | | | | | | | | | | This fork uses Git+GitHub, not SVN+java.net. Signed-off-by: Curtis Rueden <[email protected]> Signed-off-by: Harvey Harrison <[email protected]>
* | j3dcore: fix up compile to build with JOGL release 2.3.1Julien Gouesse2015-03-295-34/+34
|/
* j3dcore: update version to 1.6.0-pre111.6.0-pre11Harvey Harrison2014-08-071-1/+1
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: fix up compile to build with JOGL release 2.2.0Harvey Harrison2014-08-072-3/+3
| | | | | | setSize became setSurfaceSize. Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: avoid lazy enum array creation, do it unconditionallyHarvey Harrison2014-08-061-21/+13
| | | | | | | The static ref was not being initialized properly (needed to be synchronized), just pull it into a staic init block and mark it final. Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: cannot lock an object using its own referenceHarvey Harrison2014-08-061-18/+15
| | | | | | | | | | When updating the orientTransforms array reference, you cannot lock the update using the same ref, as the next thread in will lock the new object and concurrently run with the original updater. Pointed out by findbugs. Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: remove an unused fog state variable from Canvas3DHarvey Harrison2014-08-051-6/+0
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: remove some unused imports, mark the caps chooser class as staticHarvey Harrison2014-08-051-3/+1
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: add an enum for the capabilities to try and disableHarvey Harrison2014-08-051-53/+43
| | | | | | - remove some trailing whitespace, add missing @Override Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: removed dead codeKavon Farvardin2014-08-051-252/+0
| | | | | Signed-off-by: Kavon Farvardin <[email protected]> Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: initial fix for stereoscopic and double buffering graphics ↵Kavon Farvardin2014-08-051-119/+201
| | | | | | | configurations Signed-off-by: Kavon Farvardin <[email protected]> Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: update version to 1.6.0-pre101.6.0-pre10Harvey Harrison2014-05-031-1/+1
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: prepare to refactor the Font3D tesselation code, move variables ↵Harvey Harrison2014-05-031-16/+15
| | | | | | next to use Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: kill use of SUN_global_alphaHarvey Harrison2014-05-0310-128/+4
| | | | | | | Due to a typo testing for the extension, the jogl pipeline has never enabled this extension. Just kill it. Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: small style change to do an early return when the appContext does ↵Harvey Harrison2014-05-031-18/+19
| | | | | | not need checking Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: move fixup for null apcontext into the JOGLPipeline implementationSaeid Nourian2014-05-031-0/+36
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: update version to 1.6.0-pre91.6.0-pre9Harvey Harrison2013-12-071-1/+1
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: fix typo in updateTexture3DBoundary in JoglPipelineHarvey Harrison2013-12-071-1/+1
| | | | | | GL_TEXTURE_2D should be GL_TEXTURE_3D Signed-off-by: Harvey Harrison <[email protected]>