diff options
author | Sven Gothel <[email protected]> | 2023-09-20 19:51:55 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2023-09-20 19:51:55 +0200 |
commit | 5d6e8a367c03644740187e500c6de5d3ac039d5e (patch) | |
tree | a649f559413c51272ee3f4afff1f68ebfea45477 /make | |
parent | bbe845846ffc00807395a5070a7352c6bbe7e4ef (diff) |
Bug 1452 - Decouple math functionality to 'com.jogamp.math' to be toolkit agnostic (PMVMatrix, Matrix4f, Vec4f, ..)
Math functionality (PMVMatrix, Matrix4f, Vec4f, ..)
- shall be used toolkit agnostic, e.g. independent from OpenGL
- shall be reused within our upcoming Vulkan implementation
- may also move outside of JOGL, i.e. GlueGen or within its own package to be reused for other purposed.
The 'com.jogamp.opengl.util.PMVMatrix' currently also used to feed in GLUniformData
via the toolkit agnostic SyncAction and SyncBuffer
shall also be split to a toolkit agnostic variant.
An OpenGL PMVMatrix specialization implementing GLMatrixFunc can still exist,
being derived from the toolkit agnostic base implementation.
+++
Initial commit .. compile clean, passing most unit tests.
Diffstat (limited to 'make')
-rw-r--r-- | make/build-jogl.xml | 5 | ||||
-rw-r--r-- | make/scripts/tests.sh | 40 |
2 files changed, 24 insertions, 21 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index ee95eb642..e0dcc10ea 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -90,6 +90,9 @@ <property name="java.part.gluegen-gl-rt" value="com/jogamp/gluegen/runtime/opengl/*"/> + <property name="java.part.core.math" + value="com/jogamp/math/**"/> + <property name="java.part.core.shadercode" value="jogamp/opengl/shader/* jogamp/opengl/shader/bin/**"/> @@ -100,7 +103,7 @@ value="com/jogamp/opengl/util/* jogamp/opengl/util/* com/jogamp/opengl/util/glsl/* jogamp/opengl/util/glsl/* ${java.part.core.shadercode} ${java.part.core.assets}"/> <property name="java.part.core" - value="${java.part.gluegen-gl-rt} com/jogamp/opengl/* com/jogamp/opengl/fixedfunc/* com/jogamp/opengl/math/** jogamp/opengl/* ${java.part.core.util}"/> + value="${java.part.gluegen-gl-rt} ${java.part.core.math} com/jogamp/opengl/* com/jogamp/opengl/fixedfunc/* jogamp/opengl/* ${java.part.core.util}"/> <property name="java.part.core.exclude" value="com/jogamp/opengl/Debug* com/jogamp/opengl/Trace* com/jogamp/opengl/util/AWTAnimatorImpl* com/jogamp/opengl/util/PNG*"/> diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 566d19840..f714c9b2f 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -583,24 +583,24 @@ function testawtswt() { # # Math # -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestBinary16NOUI $* -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestBinary32NOUI $* -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestBinary64NOUI $* -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestFloatUtil01NOUI $* -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestGluUnprojectFloatNOUI $* -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestGluUnprojectDoubleNOUI $* -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestMatrix4f01NOUI $* -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestMatrix4f02MulNOUI $* -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestMatrix4f03InversionNOUI $* -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestMatrix4fMatrixMulNOUI $* -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestMatrix4fProject01NOUI $* -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestMatrix4fProject02NOUI $* -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestPMVMatrix01NEWT $* -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestPMVMatrix02NOUI $* -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestPMVMatrix03NOUI $* -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestPMVTransform01NOUI $* -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestQuaternion01NOUI $* -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestVec3f01NOUI $* +#testnoawt com.jogamp.opengl.test.junit.math.TestBinary16NOUI $* +#testnoawt com.jogamp.opengl.test.junit.math.TestBinary32NOUI $* +#testnoawt com.jogamp.opengl.test.junit.math.TestBinary64NOUI $* +#testnoawt com.jogamp.opengl.test.junit.math.TestFloatUtil01NOUI $* +#testnoawt com.jogamp.opengl.test.junit.math.TestGluUnprojectFloatNOUI $* +#testnoawt com.jogamp.opengl.test.junit.math.TestGluUnprojectDoubleNOUI $* +#testnoawt com.jogamp.opengl.test.junit.math.TestMatrix4f01NOUI $* +#testnoawt com.jogamp.opengl.test.junit.math.TestMatrix4f02MulNOUI $* +#testnoawt com.jogamp.opengl.test.junit.math.TestMatrix4f03InversionNOUI $* +#testnoawt com.jogamp.opengl.test.junit.math.TestMatrix4fMatrixMulNOUI $* +#testnoawt com.jogamp.opengl.test.junit.math.TestMatrix4fProject01NOUI $* +#testnoawt com.jogamp.opengl.test.junit.math.TestMatrix4fProject02NOUI $* +testnoawt com.jogamp.opengl.test.junit.math.TestPMVMatrix01NEWT $* +#testnoawt com.jogamp.opengl.test.junit.math.TestPMVMatrix02NOUI $* +#testnoawt com.jogamp.opengl.test.junit.math.TestPMVMatrix03NOUI $* +#testnoawt com.jogamp.opengl.test.junit.math.TestPMVTransform01NOUI $* +#testnoawt com.jogamp.opengl.test.junit.math.TestQuaternion01NOUI $* +#testnoawt com.jogamp.opengl.test.junit.math.TestVec3f01NOUI $* # @@ -1009,7 +1009,7 @@ function testawtswt() { #testnoawt com.jogamp.opengl.demos.graph.ui.UIGraphDemoU01a $* #testnoawt com.jogamp.opengl.demos.graph.ui.UILayoutGrid01 $* #testnoawt com.jogamp.opengl.demos.graph.ui.UILayoutBox01 $* -testnoawt com.jogamp.opengl.demos.graph.ui.FontView01 $* +#testnoawt com.jogamp.opengl.demos.graph.ui.FontView01 $* #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT21 $* #testnoawt com.jogamp.opengl.demos.av.MovieCube $* @@ -1038,7 +1038,7 @@ testnoawt com.jogamp.opengl.demos.graph.ui.FontView01 $* # GLDrawableFactory.createOffscreenDrawable(..) # -#testnoawt com.jogamp.opengl.test.junit.jogl.math.TestPMVMatrix01NEWT +#testnoawt com.jogamp.opengl.test.junit.math.TestPMVMatrix01NEWT #testnoawt com.jogamp.opengl.test.junit.jogl.tile.TestTiledRendering1GL2NEWT #testnoawt com.jogamp.opengl.test.junit.jogl.perf.TestPerf001RawInit00NEWT |