4807 Commits

Author SHA1 Message Date
michael
b727d5998e Fixed the swapped bits for Control and Evaluation Shader 2015-03-03 12:34:25 +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
Kirill Vainer
21ed9ecf63 Merge pull request #219 from empirephoenix/master
A very small change that creates two getters in VehicleWheel,,
2015-03-02 09:57:06 -05:00
Nehon
851af2f7bc MaterialPreviewRenderer now loads the material in a separate thread to avoid to stall the awt thread.
This and the previous change makes the material editor a lot faster to open when the loaded material has big textures.
2015-03-01 23:35:02 +01:00
Nehon
33222e33be Texture previews in the Material Editor are now processed in a separate thread 2015-03-01 23:35:01 +01:00
Nehon
f31fee4f9a Warning clean up in DDSPreview, TexturePanel and WidgetFactory before making an actual change 2015-03-01 23:34:58 +01:00
Nehon
440009c3ac Remove warnings from MaterialEditorTopComponent 2015-03-01 23:34:56 +01:00
Nehon
2fb6eac744 Used a LinkedHashMap for mat params map in the Material editor in the SDK so that mat params are displayed in the same order as in the j3md file. 2015-03-01 23:34:55 +01:00
shadowislord
a374e73376 AssetManager: adjust usage according to latest changes 2015-03-01 15:14:30 -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
Kai Börnert
d40de2629d made change also for jbullet
Signed-off-by: Kai Börnert <kai-boernert@visiongamestudios.de>
2015-03-01 07:05:44 +01:00
shadowislord
d55a859240 FBXLoader: add class to dump FBX binary files as text 2015-02-28 19:07:20 -05: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
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