4965 Commits

Author SHA1 Message Date
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
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
michael
cae4e1996a GL4ShaderSupport 2015-02-24 21:53:08 +01: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
michael
1ad8ff154c Fixed uploading of all shader stages 2015-02-23 22:39:46 +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
michael
46a48f466d Added loaders to ShaderCheck 2015-02-23 20:27:08 +01:00
michael
1949a7d831 Added GL4 Interface,
Added GL_*_SHADER constants
Added Caps to the Renderer
Added required converters
2015-02-23 20:23:18 +01:00
michael
0d3292c83a Refactoring of the shader system to allow addition of new shaderstages 2015-02-23 19:59:11 +01:00
michael
ab4d665b3e Fixed typo 2015-02-23 18:46:16 +01:00
michael
3ced941c53 Added geom,tsctrl and tseval to the GLSLLoader 2015-02-23 18:45:56 +01:00
michael
a1146f7676 Added TesselationEvaluation and TesselationControl enums 2015-02-23 18:41:14 +01:00
michael
0c35b20412 Added Patch as MeshMode
Added private variable patchVertexCount
2015-02-23 18:38:11 +01:00
michael
e45d5c093d *Added Caps:
GL3.3
 GL4.0
 GLSL400
 TesselationShader
2015-02-23 18:33:40 +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
shadowislord
d6a4ba41b4 Image: request mipmaps to be re-generated if image data is modified
- fixes ImageRaster modification not updating mipmaps bug
2015-02-22 15:43:54 -05:00
shadowislord
50f0eca3e6 Skeletal Animation: remove shared mesh support
- shared meshes in J3O / OgreXML are automatically de-shared on import, so this functionality is no longer used in the engine
2015-02-22 15:42:48 -05:00
shadowislord
5760a48eea Skeletal Animation: remove deprecated SkeletonControl ctor
- it is not useful, because targets / materials are gathered on every update() call
2015-02-22 15:41:10 -05:00
shadowislord
c5359c7359 Animation Track interface: add getKeyFrameTimes() method 2015-02-22 12:49:31 -05:00
shadowislord
d281920e60 GLSL Lighting Lib: fix flickering on directional lights in sRGB mode 2015-02-22 12:47:55 -05:00
Nehon
7037d8cc62 Changed j3o icon 2015-02-22 14:22:05 +01:00
Nehon
00e939b32b SDK About dialog update, with year's copyright, correct website URL and credits for icon sets 2015-02-22 14:12:31 +01:00
Nehon
160aa13942 Complete SDK icons overhaul. 2015-02-22 13:01:11 +01:00
shadowislord
9d715cdd2b Lighting GLSL library: use inverse square falloff for lighting in sRGB mode
- It is a slightly modified equation that actually terminates the light's influence at the light radius
2015-02-21 22:50:29 -05:00