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

6271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Riccardo Balbo
e602ed651a Remove commented/unused code. 2016-07-26 15:12:13 +02:00
Michael Braunstingl
6728ac1115 Corrected parenthesis bug. 2016-07-24 19:57:22 +02:00
Michael Braunstingl
1bbe34160c Corrected the bug in RenderState.toString() 2016-07-24 17:16:29 +02:00
Michael Braunstingl
d39b780fa5 Added RenderState.BlendMode.Custom 
BlendMode.Custom allows glBlendFuncSeparate() calls.
 2016-07-24 12:40:45 +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
Riccardo Balbo
2958fc53d7 Disable buildNativeProjects 2016-07-13 17:22:49 +02:00
Riccardo Balbo
7f87a92c72 Bullet: Remove multithread support that is not available anymore. And was never used by the engine in the first place. 2016-07-13 17:20:48 +02:00
Riccardo Balbo
e5747c2faa Update bullet to 2.83.7 2016-07-13 17:20:42 +02:00
Kai Boernert
4b5c945d80 Fix for travis 2016-07-09 12:14:22 +02:00
Kai Boernert
c71d87ed71 Extracted an Allocator interface for DirectByteBuffers 
Signed-off-by: Kai Boernert <kai-boernert@visiongamestudios.de>
 2016-07-09 12:06:39 +02:00
Kai Boernert
bc701c174b Extracted an Allocator interface for DirectByteBuffers 
Signed-off-by: Kai Boernert <kai-boernert@visiongamestudios.de>
 2016-07-09 12:04:42 +02:00
Kai Boernert
848a9217d0 Extracted an Allocator interface for DirectByteBuffers 
Signed-off-by: Kai Boernert <kai-boernert@visiongamestudios.de>
 2016-07-09 11:57:03 +02: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
shamanDevel
a8d77a7cd1 OpenCLObject.register() now returns this. 
This allows to chain the register method like kernel=program.createKernel("ScaleKernel").register(); or testBuffer=clContext.createBuffer(1024).register();
 2016-06-19 18:30:31 +02:00
shamanDevel
46db6d95f8 Added getter method for the device associated with a command queue 2016-06-19 18:06:00 +02:00
shamanDevel
eb07d69cd8 missing toString() methods added 2016-06-19 13:26:26 +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
Albert Santos
03318a6766 Fixed Point2PointJoint.createJoint() incorrectly creating btHingeConstraint 
Replaced it with btPoint2PointConstraint.
 2016-06-12 09:47:34 -04: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