| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
|
|
|
| |
- TestScreenMode01aNEWT and TestScreenMode01dNEWT
test auto-reset (destroying last Screen ref. reinstates orig MonitorMode)
- Other tests do manual reset.
- Add ant test target 'junit.run.newt.monitormode'
to test only monitor-mode / fullscreen cases
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
surface.lock[ modify ] ]
GLEventListenerState:
New model for GLEventListenerState's transaction safety:
- Z Decorate-1: Animator.pause [ X ] Animator.resume
- X Decorate-2: Surface.lock [ Y ] Surface.unlock
- Instead of setting AbstractGraphicsDevice, just swap the handle and ownership.
- Issuing setRealized(..) only if required, i.e. having an upstream-surface (EGL..) depending on used device
- Utilizing setRealized(..) on the GLAD's delegated 'real' drawable, avoiding optional GLAD locking.
- Cleanup and above changes shall render impl. easier to read.
GLEventListenerState Unit Tests:
- If swapping/moving from AWT -> NEWT, use a NEWT dedicated Display
avoiding ATI driver XCB crash - read comment.
|
|
|
|
| |
This especially impacts (fixes) Mac OSX.
|
|
|
|
|
|
|
| |
a3f2ef50ad33c58a240a17fcf03e415d772207c3, etc; Fix NewtVersion, NativeWindowVersion and NewtVersionActivityLauncher
NewtVersion, NativeWindowVersion: Also search for extension javax.media.opengl (all packaging)
NewtVersionActivityLauncher: Use new launcher URI
|
|
|
|
|
|
| |
screen position (Fixes resize -> position)
- Tested w/ NEWT GearsES2 and Java6 and Java7 on OSX
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
KeyEvent handling while distinguish keyCode (kbd layout independent) and keySym (kbd layout dependent)
API Changes:
- Virtual key codes and symbols are of type short.
- KeyEvent.keySymbol() shall return a layout dependent value (Bug 641)
- Method returns former keyCode() value, which was layout dependent.
- Returns 'short' value
- KeyEvent.keyCode() returns a short value, instead of int
- KeyEvent.keyCode() shall return a layout independent value (Bug 641)
- To ease implementation, we only 'require' the scan code to be mapped to a 'US Keyboard layout',
which allows reusing layout dependent code while preserving the goal to have a fixed physical key association
- Implementation status:
- Windows OK
- X11 TODO
- OSX: 50/50 TODO
- Using layout independent 'action keys'
- Using layout dependent 'printable keys'
- returning above semantics for both, keyCode and keySym
- Android 50/50 TODO
- Returning the layout independent keyCode
- Mapping probably incomplete
- KeyEvent.EVENT_KEY_TYPED and KeyListener.keyTyped(KeyEvent) (Bug 688)
- Marked DEPRECATED
- No more called for auto-repeat events
- Synthesized in WindowImpl.consumeKeyEvent(..): No more injection by native- or java driver code
- NEWTEvent.eventType: int -> short
- field, as well as all method involving eventType changed to short.
- NEWTEvent.isSystemEvent: REMOVED
- Never used as well as never being implemented properly
Internal Changes:
- Simplified keyEvent driver code
- Especially the Windows native driver's mapping code
could be simplified using scanCode and MapVirtualKeyEx
- NEWT Event Factories: hashMap -> switch/case
Unit Tests:
-
- Added NewtCanvasAWT Offscreen Layer Tests
important to test the AWT -> NEWT translation on OSX/CALayer:
- TestNewtKeyCodeModifiersAWT
- TestNewtKeyCodesAWT
- TestNewtKeyEventAutoRepeatAWT
- TestNewtKeyEventOrderAWT
- TestNewtKeyPressReleaseUnmaskRepeatAWT
|
|
|
|
|
|
| |
(if="jvmJava7.exe")
See GlueGen commit 6b86764f2e195b4046000fd5a7fcf3331ca72d21
|
|
|
|
| |
Exclude *AWT* and *SWT* (similar to 'junit.run.newt.headless')
|
| |
|
|
|
|
| |
TestNewtEventModifiersNEWTWindowAWT was incl. in newt headless
|
|
|
|
| |
BaseNewtEventModifiers ignore more events (clicked, wheel, entered, exited); Fix TestNewtEventModifiersNewtCanvasSWT SWT-Display thread.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
(jogl-all-android.jar, jogl-test-android.jar) if android SDK JAR files are available. ; Split up atomic jogl-util.jar
Compile and generate android JAR files (jogl-all-android.jar, jogl-test-android.jar) if android SDK JAR files are available.
- See gluegen commit 55b4552aef7882c358d545d020d6f12c958ed8ed
Also split up atomic jogl-util.jar
- jogl-util.jar -> jogl-util.jar + jogl-util-graph.jar
Footprint Stats:
This demonstrates small footprint of a minimum configuration,
all numbers in kilobytes (du -ksc).
NOTE the min size of ~ 1MB!
JOGL ALL
220 kB gluegen-rt.jar
5180 kB jogl-all.jar
4 kB libgluegen-rt.so.gz
4 kB libnativewindow_awt.so.gz
12 kB libnativewindow_x11.so.gz
100 kB libjogl_desktop.so.gz
20 kB libnewt.so.gz
5540 kB total
JOGL Min X11 Min egl es1 es2
220 kB gluegen-rt.jar
296 kB atomic/jogl-core.jar
156 kB atomic/jogl-glmobile.jar
284 kB atomic/jogl-util.jar
76 kB atomic/nativewindow-core.jar
120 kB atomic/newt-core.jar
28 kB atomic/nativewindow-os-x11.jar
28 kB atomic/newt-driver-x11.jar
4 kB libgluegen-rt.so.gz
48 kB libjogl_mobile.so.gz
12 kB libnativewindow_x11.so.gz
20 kB libnewt.so.gz
1292 kB total
JOGL Android - mobile egl es1 es2
224 kB gluegen-rt-android.jar
3020 kB jogl-all-android.jar
4 kB libgluegen-rt.so.gz
48 kB libjogl_mobile.so.gz
3296 kB total
JOGL Min Android/Mobile Min egl es1 es2
224 kB gluegen-rt-android.jar
296 kB atomic/jogl-core.jar
156 kB atomic/jogl-glmobile.jar
8 kB atomic/jogl-os-android.jar
284 kB atomic/jogl-util.jar
76 kB atomic/nativewindow-core.jar
120 kB atomic/newt-core.jar
28 kB atomic/newt-driver-android.jar
4 kB libgluegen-rt.so.gz
48 kB libjogl_mobile.so.gz
1244 kB total
|
|
|
|
|
| |
Note: Patch set not clean since build*xml files contain 'NEWT Broadcom' driver changes of upcoming commit
due to pervious uncommitted work. Will be fixed w/ next commit.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
NewtCanvasSWT allowing to parent NEWT windows natively.
SWT GLCanvas creates lazy when resource is ready
- Ensures drawable and context are created when size > zero and native visualID is valid.
The latter is platform dependent.
- Note that you cannot utilize custom GLCapabilities w/ this one,
since the configurations is already realized - use NewtCanvasSWT.
Create new NewtCanvasSWT allowing to parent NEWT windows natively:
- Similar to NewtCanvasAWT
- Allows attaching / detaching NEWT windows
NewtCanvasAWT: Public setNEWTChild(..) fixed
Added test cases for the above - tested on Linux, OSX and Windows w/ SWT
Note: As usual for OSX, add -XstartOnFirstThread
Details:
- NEWT Display has new method: 'EDTUtil setEDTUtil(EDTUtil)'
allowing to set a custom event dispatch utility.
We use this to set our SWTEDTUtil for using NEWT w/ SWT
complying w/ SWT threading constraints.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Derivation
- Depends on GlueGen commit 9a71703904ebfec343fb2c7266343d37a2e4c3db
JAR file name changes:
ALL JARs:
- jogl.all.jar -> jogl-all.jar
- jogl.all-noawt.jar -> jogl-all-noawt.jar
- jogl.all-mobile.jar -> jogl-all-mobile.jar
- jogl.all-android.jar -> jogl-all-android.jar
- jogl.all-android.apk -> jogl-all-android.apk
Atomic JARs:
- nativewindow.core.jar -> nativewindow-core.jar
- nativewindow.awt.jar -> nativewindow-awt.jar
- nativewindow.os.x11.jar -> nativewindow-os-x11.jar
- nativewindow.os.win.jar -> nativewindow-os-win.jar
- nativewindow.os.macosx.jar -> nativewindow-os-osx.jar
- jogl.core.jar -> jogl-core.jar
- jogl.sdk.jar -> jogl-sdk.jar
- jogl.glmobile.jar -> jogl-glmobile.jar
- jogl.glmobile.dbg.jar -> jogl-glmobile-dbg.jar
- jogl.util.jar -> jogl-util.jar
- jogl.glutess.jar -> jogl-glutess.jar
- jogl.glumipmap.jar -> jogl-glumipmap.jar
- jogl.util.fixedfuncemu.jar -> jogl-util-fixedfuncemu.jar
- jogl.awt.jar -> jogl-awt.jar
- jogl.swt.jar -> jogl-swt.jar
- jogl.util.awt.jar -> jogl-util-awt.jar
- jogl.os.x11.jar -> jogl-os-x11.jar
- jogl.os.win.jar -> jogl-os-win.jar
- jogl.os.osx.jar -> jogl-os-osx.jar
- jogl.os.android.jar -> jogl-os-android.jar
- jogl.gldesktop.jar -> jogl-gldesktop.jar
- jogl.gldesktop.dbg.jar -> jogl-gldesktop-dbg.jar
- jogl.glugldesktop.jar -> jogl-glu-gldesktop.jar
- jogl.util.gldesktop.jar -> jogl-util-gldesktop.jar
- jogl.omx.jar -> jogl-omx.jar
- jogl.cg.jar -> jogl-cg.jar
- newt.core.jar -> newt-core.jar
- newt.ogl.jar -> newt-ogl.jar
- newt.awt.jar -> newt-awt.jar
- newt.event.jar -> newt-event.jar
- newt.driver.x11.jar -> newt-driver-x11.jar
- newt.driver.win.jar -> newt-driver-win.jar
- newt.driver.macosx.jar -> newt-driver-osx.jar
- newt.driver.android.jar -> newt-driver-android.jar
- newt.driver.kd.jar -> newt-driver-kd.jar
- newt.driver.intelgdl.jar -> newt-driver-intelgdl.jar
- newt.driver.broadcomegl.jar -> newt-driver-broadcomegl.jar
Test JARs:
- jogl.test.jar -> jogl-test.jar
- jogl.test-android.jar -> jogl-test-android.jar
- jogl.test-android.apk -> jogl-test-android.apk
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
specific classes for non Android platforms.
Adapt to GlueGen commits: b3c9951006f9bd863244f1db3d54ac7866d66f0a, 86c1df6fdca183454ff544857f4236b646c4730d
Ensure same Java JAR content regardless of build target (fix).
Separate Android compilation results: jogl.all-android.jar and jogl.test-android.jar
avoiding generating different content w/ non android builds.
Adding ${android.abi} to APK target name (jogl.all-android.apk -> jogl.all-android-armeabi-v7a.apk)
if not generic.
|
| |
|
| |
|
|
|
|
| |
incl. unit tests; Test/Demos: Use PNG snapshots.
|
|
|
|
| |
Move texture to jogl jar/apk for accessibility.
|
|
|
|
|
| |
- Factory falls back to NullGLMediaPlayer allowing to test on platforms where no player is available.
- MovieSimple (c) to JogAmp since it is no more derived from the old project.
|
| |
|
|
|
|
|
|
|
|
| |
0cfc7847c58b51c9a26b50d905b592d1fc4c8578)
- Remove jogl.android-launcher.apk in favor of generic jogamp.android-launcher.apk
- All Android test code resides in jogl.test.apk (initial launcher and delegated 'real' one)
|
|
|
|
|
|
| |
- BOOTCLASSPATH - see gluegen commit 227ad20f6bf10d5d28073dfbd3fac363e3a09531
- Move jogl.test.apk creation in build-test.xml
- Enable and fix 'junit.run.remote.adb' target
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
junit.run.remote.ssh -> junit.run.remote.ssh.all
added junit.run.remote.ssh.newt
added junit.run.remote.ssh.awt
junit.run.tests issues 'junit.run.remote.ssh.newt' only for now.
manual remote ssh unit test invocation:
bash scripts/make.jogl.all.linux-armv7-cross.sh -f build-test.xml junit.manual.run.remote.ssh.newt
bash scripts/make.jogl.all.linux-armv7-cross.sh -f build-test.xml junit.manual.run.remote.ssh.awt
bash scripts/make.jogl.all.linux-armv7-cross.sh -f build-test.xml junit.manual.run.remote.ssh.all
|
|
|
|
| |
favor a more detailed request than getDefault().
|
| |
|
|
|
|
| |
failure.
|
|
|
|
| |
otherwise the jenkins build fails.
|
|
|
|
| |
gluegen commit 0dce3191754bd73138ff6a72e576a2af05f850ba
|
| |
|
|
|
|
|
|
|
| |
GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv7.xml
make.jogl.all.linux-armv7-cross.sh:
Use GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv7.xml
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
grained controll of test behavior.
Matching gluegen commit 5459979a097f91011d3f23ff6f25e1dc34b1d52a
Environment vars, mapped to properties:
JUNIT_RUN_ARG0 -> junit.run.arg0
JUNIT_RUN_ARG1 -> junit.run.arg1
This allows us to disable ScreenMode on Linux-ARM-Omap4 for example,
where XRandR calls consume up to 3s per test.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
framework, NEWT)
- Fix Bug 516 (Determine Java Version).
See gluegen: 64639b805a32338385421f168e12c1ef7f749d00
- Fix OS X 10.5 linkage (weak framework, NEWT)
- Use weak framework linkage for all modules and frameworks:
AppKit, QuartzCore, Cocoa, OpenGL, JavaNativeFoundation
- NEWT: Handle NS exception while calling OS X >= 10.6 only methods:
- 'setAllowsConcurrentViewDrawing()'
- 'setCanDrawConcurrently()'
|
|
|
|
| |
threading (-> FIXME)
|
|
|
|
|
|
|
|
|
|
|
| |
Fix SWT test on OSX 32/64 bit:
- Pick 32bit SWT for 32bit tests
Fix TestSWTAWT01GL for OSX:
- Using proper thread for AWT and SWT actions, platform agnostic
but required for OSX.
- Enable SWT*AWT* tests on OSX
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
flags (-d32/-d64) ; glxext.h uses 'gl-64bit-types.h'
Cleanup dependencies and linker args
- JOGL/NEWT: remove Xxf86vm dependency
- NativeWindow Solaris: Use std 'Xinerama' and 'xf86vmode'
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
separation ; android cleanup
remaining all-in-one jnlp's / jars:
jogl-all-awt.jnlp -> jogl.all.jar
jogl-all-noawt.jnlp -> jogl.all-noawt.jar
jogl-all-mobile.jnlp -> jogl.all-mobile.jar
native for all above: jogl-all-natives-linux-amd64.jar
jogl.all-android.apk jogl.all-android.jar
more may follow for each supported platfrom
++++
- newt: proper 'driver' separation
- all drivers reside now in jogamp.newt.driver.*
- remove intptr.cfg / use gluegen's
|
| |
|
| |
|