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

329 Commits

Author SHA1 Message Date
David Bernard
a19246973c build: enable assertion for test and run (previously only test as assertionEnabled = true) 2015-03-06 10:47:04 +01:00
Nehon
40905061b5 Fixed an issue in TechniqueDef due to recent Geom and tesselation shader addition 2015-03-05 18:49:32 +01:00
Nehon
d6c6884066 Removed code duplication in BatchNode 2015-03-03 22:52:52 +01:00
Rémy Bouquet
46c00c95b3 Merge pull request #226 from jMonkeyEngine/pr/223 
Obsolete shadowRecv and sceneReceivers code cleanup
 2015-03-03 22:35:25 +01:00
Nehon
1616b08c5b Fixed issue when BatchNode's light list flag was not cleared 2015-03-03 22:11:17 +01:00
Rémy Bouquet
d74d5e6ca9 Merge pull request #154 from abies/master 
Speedup for TangengBinormalGenerator
 2015-03-03 21:48:37 +01:00
michael
b727d5998e Fixed the swapped bits for Control and Evaluation Shader 2015-03-03 12:34:25 +01:00
Bebul
8c37778749 Obsolete shadowRecv and sceneReceivers code cleanup 2015-03-03 08:46:10 +01:00
Nehon
dead648e34 Fixed NPE in ShaderKey when using ShaderNodes. 2015-03-02 20:31:48 +01:00
Kirill Vainer
273f3a6e62 Merge pull request #220 from zzuegg/master 
Geometry shader and Tessellation shader support
 2015-03-02 10:01:08 -05:00
shadowislord
40926dc32d AssetConfig: Platform asset config now returned as URL 
- Return back DesktopAssetManager constructor with boolean argument - this time it shall use platform config instead of always using Desktop.cfg
 2015-03-01 15:11:57 -05:00
michael
5b58bda23f Merge branch 'master' of https://github.com/jMonkeyEngine/jmonkeyengine into GL4ShaderSupport 
Conflicts:
	jme3-core/src/main/resources/com/jme3/asset/Desktop.cfg
 2015-03-01 09:48:36 +01:00
shadowislord
92e08b1f2b Application: use JmeSystem to get asset config URL 2015-02-28 19:05:48 -05:00
shadowislord
25b1780e09 AssetManager: remove useless subclasses 
* All platforms now use asset configuration files. Subclasses of DesktopAssetManager no longer required.
 * Added general asset config file which is included by all
 * JmeSystemDelegate now always returns DesktopAssetManager
 * JmeSystem is now responsible for providing the platform-specific asset config path
 * Deprecate JmeSystem.createImageRaster(), it is simpler to create a DefaultImageRaster
 2015-02-28 18:32:38 -05:00
shadowislord
9b13b34bd5 RenderManager: cleanup viewport computation (related to PR #217) 2015-02-28 16:46:52 -05:00
shadowislord
f2cd1334ec jme3tools.converters: remove deprecated classes 2015-02-28 16:41:24 -05:00
shadowislord
ca497f458a AssetManager ImplHandler: synchronized access in clearCache() 2015-02-28 16:40:32 -05:00
shadowislord
a7765cfb63 com.jme3.asset.plugins: javadoc additions 2015-02-28 16:39:12 -05:00
shadowislord
c6317cc531 com.jme3.asset.cache: javadoc fixes 2015-02-28 16:38:11 -05:00
shadowislord
938dc3640b AnimControl: fix javadoc 2015-02-28 16:37:26 -05:00
shadowislord
90925e3968 AssetManager: javadoc, cleanup, new method 
* Move *cache* methods up into the AssetManager interface from DesktopAssetManager
 * Fix various incorrect javadoc
 * Add new method to load an asset from an InputStream
 * Restructure DesktopAssetManager.loadAsset() to make it less monolithic
 2015-02-28 16:34:55 -05:00
michael
1233fcf727 Removed a Sysout 2015-02-28 17:03:10 +01:00
michael
99d69d1d01 Fixed formatting thanks to EmpirePhoenix 2015-02-28 16:45:18 +01:00
michael
a59f017710 Removed two sysouts 2015-02-28 14:02:50 +01:00
michael
4e8d6cc498 Added some javadoc 2015-02-28 13:58:30 +01:00
michael
951a623930 Fixed hashCode 2015-02-28 13:58:09 +01:00
michael
273ad711bf Fixed Typo 2015-02-28 13:43:07 +01:00
michael
2c2187f3d7 Fixed Typo 2015-02-28 13:42:40 +01:00
michael
5c4519b4c9 Fixed Typo 2015-02-28 13:42:16 +01:00
michael
515b48153c Fixed Typo 2015-02-28 13:41:52 +01:00
michael
58bcb39a2d Added getter for patchVertexCount 2015-02-28 13:38:52 +01:00
michael
fd78f4d896 Added renderer support for glPatchParameter 2015-02-28 13:38:34 +01:00
michael
5c70938ccf Added GL_PATCHES as new constant 2015-02-28 13:32:16 +01:00
michael
555d73b851 Added GL_PATCHES as new constant 2015-02-28 13:12:19 +01:00
michael
dfca3d5ca0 Added GL_PATCHES to convertElementMode 2015-02-28 13:11:59 +01:00
michael
19143def9b *Modified computeNumElements to support n-Patches 2015-02-28 12:54:38 +01:00
michael
6983aff1f3 *Reapplied -LINEAR fix from 02322d04cc 2015-02-28 10:55:40 +01:00
michael
9e74c4e2bb *reverted J3MLoader 2015-02-28 10:38:17 +01:00
michael
f64eb5ff09 *merge from upstream 2015-02-28 10:29:14 +01:00
Kirill Vainer
f7624be761 Merge pull request #217 from nhansen1/master 
Fix for incorrect viewport sizes
 2015-02-27 22:33:08 -05:00
Nehon
56aabe3fac Fixed a NPE in MaterialDebugAppState when a Pass was declared in a filter but not instantiated. 2015-02-27 18:38:44 +01:00
Rémy Bouquet
45c3776395 Fixed warnings due to missing @Override or missing @params in javadoc. In BasicProfilerState and BaseAppState 2015-02-27 08:32:40 +01:00
Rémy Bouquet
74e4b9823a Changed enable() and disable() methods in BaseAppState in onEnable() and onDisable() 2015-02-27 08:29:43 +01:00
Nicholas Hansen
6bb5fcfb04 Fix for incorrect viewport sizes 
Fixed an issue where viewport sizes could be a pixel smaller in either
dimension in certain situations.  This caused gaps to appear between
adjacent viewports at certain resolutions.
Forum Reference:

http://hub.jmonkeyengine.org/t/fix-for-rounding-errors-in-viewport-dimensions/31751
 2015-02-27 12:25:04 +10:00
Kirill Vainer
f0998d14d0 GLRenderer: support limited NPOT on iOS 
See this: 
https://www.khronos.org/registry/gles/extensions/APPLE/APPLE_texture_2D_limited_npot.txt

Note that NPOT is still not available on cubemaps or 3D textures, however this is fairly uncommon.
 2015-02-25 10:45:39 -05:00
shadowislord
331e71f261 SinglePass Lighting: fix colorramp feature 2015-02-24 23:09:38 -05:00
shadowislord
4c69cc00a6 SP / MP Lighting: render ambient color if no lights or only ambient lights 
- Prevents "invisible model" bug if there are no lights
 2015-02-24 21:53:55 -05:00
shadowislord
32e56351df Material.preload(): fix incorrect param names being uploaded (w/o prefix) 
- This would cause garbage uniforms to be allocated when testing for HW skinning
 2015-02-24 21:52:42 -05:00
shadowislord
3a19a2bb12 Shader: make sure uniform name starts with either m_ or g_ 2015-02-24 21:52:00 -05:00
shadowislord
fd0832af98 SinglePass Lighting: fix light color not being used for specular highlight 2015-02-24 21:50:45 -05:00