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

4767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
shadowislord
d3b71cd946 OgreXML material loading: some material state was not reset, causing it to leak to other models 2015-02-24 22:09:57 -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
shadowislord
957801ea12 SinglePass Lighting: Comment out color ramp - doesn't seem to work 2015-02-24 21:50:03 -05:00
shadowislord
550255b1d5 HttpZipLocator: fix unsupported exception on HTTPS URLs 2015-02-24 21:49:06 -05:00
shadowislord
02322d04cc J3MLoader: fix negative signs ("-") inside mat params 
- Also move the "-LINEAR" directive to be associated with the parameter declaration instead of parameter default value
 2015-02-24 20:36:24 -05:00
Kirill Vainer
5508dc05f5 Merge pull request #196 from Bebul/collideWithOptimization 
Collide with optimization
 2015-02-24 13:21:40 -05:00
Bebul
75a801f0f7 CollideWith optimization with CollisionResult allocation avoided 2015-02-24 18:02:29 +01:00
Normen Hansen
3aa8aed142 - add/remove multiple physics controls via PhysicsSpace.add / .remove 2015-02-24 11:10:00 +01:00
Rémy Bouquet
6fdf0dffd3 Merge pull request #211 from Bebul/optimizeRenderShadow 
Optimize RenderShadow to use scene hierarchy for culling
 2015-02-23 21:52:59 +01:00
shadowislord
621f6de083 Terrain GLSL shader: fix incorrect glsllib import 
- (PhongLighting -> BlinnPhongLighting)
 2015-02-22 16:51:50 -05:00
shadowislord
2f86e0c17b Delete TestTriangleStrip 
- since triangle stripper was removed, this test was not compiling
 2015-02-22 16:04:01 -05:00
shadowislord
14ff6e4f29 SinglePass Lighting: support two sided lighting 
- also added test case with both regular per pixel lighting and bump mapping
 - NOTE: two sided lighting is not supported with vertex lighting
 2015-02-22 15:47:56 -05:00
shadowislord
270f4957ef SinglePass Lighting: fix GLSL syntax error when parallax mapping is used 2015-02-22 15:45:23 -05:00