4850 Commits

Author SHA1 Message Date
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
47e1c336e6 XMLImporter: make sure to close stream if exception occurs 2015-02-28 18:29:38 -05:00
shadowislord
bbbcd8eba5 Android Images: deprecate classes that won't be used in 3.1 2015-02-28 18:28:35 -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
aa88bef2bb Merge branch 'master' of https://github.com/zzuegg/jmonkeyengine into GL4ShaderSupport 2015-02-28 16:55:54 +01:00
michael
99d69d1d01 Fixed formatting thanks to EmpirePhoenix 2015-02-28 16:45:18 +01:00
Michael Zuegg
d3e80453ea Update gradle.properties 2015-02-28 16:10:33 +01:00
Michael Zuegg
4fa271582d Update .gitignore 2015-02-28 16:10:22 +01:00
Michael Zuegg
6ef0a11c38 Update gradle.properties 2015-02-28 16:07:14 +01:00
Michael Zuegg
5c1fe73530 Update gradle.properties 2015-02-28 16:06:42 +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
1cce72cd0a Allow modifing of the tess factor with keys a and y 2015-02-28 13:53:36 +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
690dd7bf28 Added Geometry and Tessellation Shader Tests 2015-02-28 13:40:10 +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
Kai Börnert
409f5ab766 A very small change that creates two getters in VehicleWheel,,
these are necessary if jme's bullet wrapper is used in a non Scenegraph enviroment,
for example a ES based server.

Signed-off-by: Kai Börnert <kai-boernert@visiongamestudios.de>
2015-02-28 10:53:26 +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
michael
ea4ff8bbf8 GL4ShaderSupport 2015-02-28 10:26:21 +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
Erlend Sogge Heggen
b0b62cb467 Update CONTRIBUTING.md 2015-02-27 18:15:24 +01:00
Erlend Sogge Heggen
bebabb32c8 Update CONTRIBUTING.md 2015-02-27 18:12:11 +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
01f673c826 Merge pull request #216 from NemesisMate/patch-2
Fixed BufferUnderflowException
2015-02-26 10:32:49 -05:00
NemesisMate
2aa6f9f521 Fixed BufferUnderflowException
Fixed the exception occurring when using this serializer. More commented here:

http://hub.jmonkeyengine.org/t/savableserializer-and-client-bufferunderflowexception/31774
2015-02-26 14:41:29 +01:00
shadowislord
ee151af5d2 iOS: use generic GLRenderer (untested)
- many methods are stubs .. may need some cleanup later on the native code side.
2015-02-25 23:20:42 -05: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