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

5897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Braunstingl
d39b780fa5 Added RenderState.BlendMode.Custom 
BlendMode.Custom allows glBlendFuncSeparate() calls.
 2016-07-24 12:40:45 +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
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
Nehon
201010b6f0 fixed a merge issue in the previous bomb merge 2016-07-07 20:48:13 +02:00
Nehon
16023fa481 PBR has come 
Merge branch 'PBRisComing'

# Conflicts:
#	jme3-core/src/main/java/com/jme3/material/Material.java
#	jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java
 2016-07-07 20:36:31 +02:00
Nehon
67fb8fc812 Fixed an issue in SinglePAssAndLightBasedLogic where texture units were not properly assigned 2016-07-07 19:53:59 +02:00
Rémy Bouquet
84b2f67393 Merge pull request #501 from MeFisto94/HwSkinningFixV02 
Fixes #499: Fix Hardware Skinning in 3.1
 2016-07-04 07:44:44 +02:00
Julien Gouesse
c591bd368c Merge pull request #519 from saloisio/master 
NewtMouseInput no longer auto-centers mouse cursor
 2016-06-30 17:41:29 +02:00
saloisio
e187cb7e9b Merge branch 'master' of https://github.com/saloisio/jmonkeyengine 2016-06-30 10:39:03 -04:00
saloisio
76cbd45784 Removed auto-centering of mouse cursor 2016-06-30 10:35:21 -04:00
Paul Speed
3f7f9b125d Merge pull request #515 from tiatin/iterator-garbage-collection-improvement 
Garbage collection and list iteration improvements
 2016-06-26 21:47:47 -04:00
empirephoenix
c288d7427a Merge pull request #514 from NemesisMate/patch-9 
userdata to null again once all data is removed.
 2016-06-26 21:51:29 +02:00
tiatin
8e8186de0a Changed overrides from ArrayList to SafeArrayList for GC and iteration performance reasons. Fixed bug in SafeArrayList.equals(). 2016-06-26 12:31:34 +03:00
tiatin
b524dcd66d Added iteration using iterator, if List is not ArrayList. 
Reason for this is that if List is LinkedList, complexity for get(int i) is O(n/4).
 2016-06-25 18:15:03 +03:00
tiatin
9c669547ab Changed iteration over List from for-each to manual iteration. 
For-Each loop creates Iterator object and uses hasNext and next methods, which are slower, than manual iteration. Also allocating Iterator object increases work for GC.

Forum post: https://hub.jmonkeyengine.org/t/iteration-over-list-performance-improvement/36250

See test 9 for more details: http://www.devahead.com/blog/2011/12/coding-for-performance-and-avoiding-garbage-collection-in-android/
 2016-06-25 15:45:24 +03:00
NemesisMate
ce82a8a7b9 improved the setUserData method. 2016-06-25 11:16:46 +01:00
Rémy Bouquet
664ea53cc6 Merge pull request #513 from riccardobl/PBRisComing 
Fix npe
 2016-06-23 22:53:30 +02:00
Riccardo Balbo
f3319d3fd6 Fix npe 2016-06-23 22:05:05 +02:00
NemesisMate
cdc708dcda userdata to null again once all data is removed. 2016-06-23 16:57:06 +01:00
empirephoenix
e2b6c51730 Merge pull request #511 from empirephoenix/master 
Finally fixing this
 2016-06-22 16:18:57 +02:00
empirephoenix
e4840e2e9f Merge pull request #512 from riccardobl/pr200616 
Removed warning if scale=1,1,1 in CylinderCollisionShape
 2016-06-21 15:32:13 +02:00
Riccardo Balbo
56558841e7 CylinderCollisionShape: don't print warning if scale = 1,1,1 2016-06-21 14:56:33 +02:00
Kai Boernert
22db3212e1 Finally fixing this 
https://hub.jmonkeyengine.org/t/jmonkey-3-1-native-bullet-bug/33595/3
http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?p=12158&f=9&t=

Signed-off-by: Kai Boernert <kai-boernert@visiongamestudios.de>
 2016-06-13 13:06:35 +02:00
empirephoenix
65164e2075 Merge pull request #507 from jjYBdx4IL/master 
fixes issue https://github.com/jMonkeyEngine/jmonkeyengine/issues/506…
 2016-06-11 17:16:10 +02:00
jjYBdx4IL
a20a84cf42 fixes issue https://github.com/jMonkeyEngine/jmonkeyengine/issues/506 : Material->toString() does not prevent/check for possible NPEs 2016-06-07 23:42:29 +02:00
empirephoenix
6e8ba0f877 Merge pull request #500 from shamanDevel/PreOrderTraversal 
added a pre-order traversal of the scene graph
 2016-06-05 11:49:37 +02:00
Nehon
619a323b9d Fixed an issue when resizing the viewport, with a FPP and antialiasing would stop rendering 2016-06-02 18:53:59 +02:00
empirephoenix
fbf2dd4497 Merge pull request #494 from shamanDevel/OpenCL 
OpenCL for jME3
 2016-05-28 18:38:47 +02:00
shamanDevel
a834a4dad6 added test for multiple parallel applications: multiple OpenCL contexts do not work 2016-05-27 11:48:24 +02:00
shamanDevel
dcdcbc3a97 added test for context switching. 
Changing the OpenCL platform and device by restarting the application works.
 2016-05-27 10:32:49 +02:00
MeFisto94
9e187647d0 Fix Hardware Skinning in 3.1 by implementing proper Array Serialization for MatParams and making the Shared Materials Check only a warning (it would pop up once each time you load the j3o and if you really use Shared Materials you have weird animations and some log spamming) 2016-05-25 17:40:00 +02:00
shamanDevel
66b8447caa Added pre-order traversal as an alternative to the default post-order depth first search traversal 2016-05-25 13:58:30 +02:00
shamanDevel
e5e5128a65 Fixed Program.getBinary() for LWJGL3 2016-05-25 13:29:49 +02:00
shamanDevel
dd22ebefdd Implemented Program.getBinary() with Jocl. 
The program cache now also works with Jocl.
Thanks to @gouessej for his help.
 2016-05-23 08:07:42 +02:00
empirephoenix
65fd7425fa Merge pull request #497 from NemesisMate/patch-7 
Ordering + raw methods instead of reversing.
 2016-05-22 17:21:59 +02:00
NemesisMate
8a058c61f1 Changed LinkedList for ArrayList in rayTests 2016-05-20 10:00:08 +01:00
Nehon
60a031dc02 Fixed an issue in the fog filter's shader that was preventing it to run on android 2016-05-19 18:54:57 +02:00
NemesisMate
3b0e0766c5 Oops! 2016-05-19 11:47:06 +01:00
NemesisMate
4cd424ad03 Ordering physics rayTest returned list instead of reversing it. 
Added raw results ray tests too.
 2016-05-19 11:25:19 +01:00
Julien Gouesse
5a5ffdc2ae First attempt of fix for the issue #490 2016-05-18 21:11:51 +02:00
empirephoenix
2c1fd47a67 Merge pull request #477 from riccardobl/fix_topic35663_issue 
Ogre importer: Fix for material sharing
 2016-05-18 11:41:52 +02:00
jmekaelthas
93080f506a Bugfix: fixed a bug that caused some models to be half-transparent when 
it was not needed.
 2016-05-17 19:29:24 +02:00
Rémy Bouquet
334cad4657 proper equal and hashcode for ShaderNodesVariables. 2016-05-15 09:00:54 +02:00
Rémy Bouquet
ba92462521 Merge pull request #495 from Dokthar/typo_fix 
That's not those typos you're looking for....
 2016-05-12 18:31:55 +02:00
Dokthar
63fb53f6e4 more typo ... ytpo ytop opyt ;) 2016-05-11 23:50:34 +02:00
Dokthar
a52a51cb27 typo fix in materials & shaders, also fix some javadoc 2016-05-11 22:56:57 +02:00
shamanDevel
bd491dc416 removed fixmes 2016-05-11 09:48:45 +02:00
shamanDevel
e32ebe11bb fixed context creation for LWJGL3 2016-05-11 09:42:11 +02:00