sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,953 Commits 21 Branches 35 Tags
Commit Graph

5953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémy Bouquet
c50b4dbeaa Merge branch 'master' of https://github.com/jMonkeyEngine/jmonkeyengine 
# By Nehon (2) and others
# Via GitHub (7) and Nehon (1)
* 'master' of https://github.com/jMonkeyEngine/jmonkeyengine:
  Clean up in the PBR j3md file to remove warnings
  Fix for #502
  Minor fix in javadoc for Camera.java class
  minor cleanup in GLRenderer
  fixed missing Cloneable in the Triangle.
  Fix for MTR Framebuffers
  fixed a typo
  Using LegacyApplication in the iOS Harness just like it has been done for Android in 3c56afe
  Fixed wrong alpha handling in the pbr shader
  Added a cursor cache to avoid cursor disappearing and app crashing when too many cursors are created
 2016-09-22 09:09:00 +02:00
Rémy Bouquet
907ee122a1 Fixed wiki links in the realm.md 2016-09-22 09:08:53 +02:00
Nehon
f642e56517 Clean up in the PBR j3md file to remove warnings 2016-09-18 15:25:00 +02:00
Rémy Bouquet
445f7ed010 Merge pull request #557 from shamanDevel/FrameBuffer.addColorBuffer(Image.Format) 
Fix for #502
 2016-09-16 10:19:28 +02:00
Sebastian Weiß
97cac35105 Fix for #502 2016-09-16 09:42:57 +02:00
Paul Speed
9e5d9613ec Merge pull request #556 from Ali-RS/master 
Minor fix in javadoc for Camera.java class
 2016-09-15 01:59:38 -04:00
Ali-RS
8937e93cce Minor fix in javadoc for Camera.java class 2016-09-15 09:41:04 +04:30
Kirill Vainer
86c2c7f341 minor cleanup in GLRenderer 2016-09-14 19:11:14 -04:00
Kirill Vainer
c872cb2fdb Merge pull request #555 from JavaSaBr/master-original 
fixed missing Cloneable in the Triangle.
 2016-09-11 20:31:19 -04:00
Kirill Vainer
eadec4c5ad Merge pull request #554 from TehLeo/patch-2 
Fix for MTR Framebuffers
 2016-09-11 15:01:56 -04:00
javasabr
651c3cc29e fixed missing Cloneable in the Triangle. 2016-09-11 13:50:52 +03:00
TehLeo
28281f7962 Fix for MTR Framebuffers 
The problem: Happens with two MTR framebuffers with same number of color attachements.
If we set a frame buffer frame1, then later frame2.
r.setFrameBuffer(frame1);
r.setFrameBuffer(frame2);
Frame2 buffer will not output to multiple targets. Only its first target will be rendered.
This patch fixes that problem.
 2016-09-10 20:33:50 +02:00
empirephoenix
c947e12bfd Merge pull request #551 from Ali-RS/master 
fixed a typo
 2016-09-06 15:37:02 +02:00
Ali-RS
bdd15b7f3e fixed a typo 2016-09-06 17:12:43 +04:30
empirephoenix
aa839beb71 Merge pull request #543 from tonihele/issue-537-master 
Added a cursor cache to avoid cursor disappearing and app crashing wh…
 2016-09-05 16:03:59 +02:00
Rémy Bouquet
977610bbd7 Merge pull request #546 from MeFisto94/ios-legacyapplication-master 
Using LegacyApplication in the iOS Harness
 2016-08-20 11:59:10 +02:00
MeFisto94
0262b72258 Using LegacyApplication in the iOS Harness just like it has been done for Android in 3c56afe 2016-08-20 11:28:04 +02:00
Nehon
9665b985e4 Fixed wrong alpha handling in the pbr shader 2016-08-19 10:54:30 +02:00
Rémy Bouquet
2c388e489a null check on the lightList in SinglePassAndImageBasedLightingLogic.makeCurrent. as it may be null when you preload 2016-08-14 14:09:55 +02:00
Rémy Bouquet
beb5033747 added GLSL compat to the pbr shader 2016-08-14 11:09:18 +02:00
Rémy Bouquet
5aa8af28cd fixed Lod functions overload in GLSLCompat lib 2016-08-14 11:03:48 +02:00
Rémy Bouquet
85c119c132 Changed the way IBL is switched on and off in the PBR shader and in the technique def logic because the old way was causing some issues on mac... for some unknown reason. 
Now it's toggled on and off with a define, but there might still be some issues on mac when there are several lighting passes.
 2016-08-14 10:57:42 +02:00
Rémy Bouquet
8f701460aa used enable instead of require for the textureCubeLod extension 2016-08-14 08:47:57 +02:00
Rémy Bouquet
aeb4daf04f Fixed some issue with textureCubeLod in the PBR shader with early versions of glsl 2016-08-14 00:56:00 +02:00
Rémy Bouquet
662a0151e2 fixed glsl 1.0 version of the postShadowFilter shader 2016-08-12 20:51:56 +02:00
Rémy Bouquet
68c082c13d fixed transparent shadows on mac. 2016-08-12 18:25:09 +02:00
Rémy Bouquet
7efbccfe4d Changed the int value of EdgeFilteringMode.Nearest from 0 to 10 as it seems a define with a 0 value is now ignored. 2016-08-12 14:30:50 +02:00
Toni Helenius
f2384c8063 Added a cursor cache to avoid cursor disappearing and app crashing when too many cursors are created 2016-08-10 20:02:34 +03:00
empirephoenix
671be243b0 Merge pull request #540 from oOMoeOo/master 
Removed Sysout-Calls in AwtPanel (Issue #539)
 2016-08-07 16:56:38 +02:00
Julien Gouesse
d0f0cfe5e7 Fixes a spelling mistake in the reflection allocator 2016-08-07 15:00:07 +02:00
Julien Gouesse
f820bbfd94 Fixes the reflection allocator with Java 9, tested with Java 9 Early Access build 129 and OpenJDK 1.8.0 update 101 2016-08-07 14:31:43 +02:00
Nehon
e89e0e7c12 Added a way to approximate the normals for the SSAO filter instead of rendering an additional geometry pass. 2016-08-06 15:16:29 +02:00
Markus Uhlig
eaa9858b18 - Replaced console outputs by the standard java logging concept and removed obsolete Sysout-Calls. 
- No functional changes.
- added missing override tags.
 2016-08-04 11:11:30 +02:00
empirephoenix
46891b32c6 Merge pull request #510 from bertleft/master 
Bugfix: Native Point2PointJoint.createJoint() incorrectly allocates btHingeConstraint
 2016-07-26 16:38:17 +02:00
Kirill Vainer
651753c4d3 Merge pull request #533 from empirephoenix/master 
BufferAllocator Round 2
 2016-07-26 10:28:48 -04:00
Kirill Vainer
94c368aa42 Merge pull request #528 from riccardobl/bullet2.83.7 
Update to Bullet 2.83.7
 2016-07-26 10:27:46 -04:00
Riccardo Balbo
e602ed651a Remove commented/unused code. 2016-07-26 15:12:13 +02:00
Kirill Vainer
4f41a28a8c Merge pull request #527 from shamanDevel/OpenCL2 
OpenCL for jME3 - some missing features
 2016-07-23 11:36:15 -04:00
Riccardo Balbo
6b1656f337 Compile with Ofast and disable _FORTIFY_SOURCE 2016-07-22 11:51:19 +02:00
Kai Boernert
b4c6febe4c whitespace tab to 4spaces formating only change 
Signed-off-by: Kai Boernert <kai-boernert@visiongamestudios.de>
 2016-07-21 17:17:34 +02:00
Kai Boernert
846232063c whitespace tab to 4spaces formating only change 
Signed-off-by: Kai Boernert <kai-boernert@visiongamestudios.de>
 2016-07-21 09:45:41 +02:00
Kai Boernert
810a4c3350 fix for wrongly marking as used, thanks to AlrikG for finding this 
Signed-off-by: Kai Boernert <kai-boernert@visiongamestudios.de>
 2016-07-20 10:46:37 +02:00
empirephoenix
5e04039390 Merge pull request #2 from empirephoenix/revert-1-BufferAllocator 
Revert "jemalloc allocator and reflection allocator fix"
 2016-07-20 10:40:42 +02:00
empirephoenix
85d62d44aa Revert "jemalloc allocator and reflection allocator fix" 2016-07-20 10:35:41 +02:00
Rémy Bouquet
0299e401cc Merge pull request #531 from riccardobl/pr190716 
Use texture() instead of texture2D() in bloomExtract15 and bloomFinal15
 2016-07-19 18:35:42 +02:00
Riccardo Balbo
62d92d75ca Use texture() instead of texture2D() in bloomExtract15 and bloomFinal15 2016-07-19 12:40:16 +02:00
empirephoenix
54c04ce23e Merge pull request #1 from AlrikG/BufferAllocator 
jemalloc allocator and reflection allocator fix
 2016-07-16 01:24:45 +02:00
Alrik
dea6f6ab1c - fix ReflectionAllocator use wrong buffer allocator to initialize 
- add jemalloc allocator
 2016-07-15 11:27:37 +02:00
Rémy Bouquet
a1b785a84c Merge pull request #529 from tiatin/FilterPostProcessorImageFormat 
Added ability to set framebuffer image format used in FilterPostProce…
 2016-07-13 23:01:11 +02:00
tiatin
c9b5f9eb59 Added ability to set framebuffer image format used in FilterPostProcessor. 
https://hub.jmonkeyengine.org/t/ability-to-change-image-format-for-filterpostprocessor/36379
 2016-07-13 21:49:24 +03:00