diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-06-27 23:21:45 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-06-27 23:21:45 -0300 |
| commit | 2af2a84a03fd707cfa4c682aff34d722343d8985 (patch) | |
| tree | 50d064e8bba7d5efb5974e3fa3a67e076fb5ef8b /scene/resources/environment.h | |
| parent | 1cc96a4d7440d9e8a20f7dbf17cf5771170de83d (diff) | |
Misc Fixes
==========
-NOTIFICATION_WM_QUIT fixed on android (seems tha way this is reported changed in newer sdk)
-WIP implementation of APK Expansion APIs for publishing games larger than 50mb in Play Store
-Feaures in the new tutorials are all present in the sourcecode
-This (hopefully) should get rid of the animation list order getting corrupted
-Improved 3D Scene Importer (Skeletons, Animations and other stuff were not being merged). Anything missing?
-In code editor, the automatic syntax checker will only use file_exists() to check preload() else it might freeze the editor too much while typing if the preload is a big resource
-Fixed bugs in PolygonPathFinder, stil pending to do a node and a demo
Diffstat (limited to 'scene/resources/environment.h')
| -rw-r--r-- | scene/resources/environment.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/scene/resources/environment.h b/scene/resources/environment.h index b72d6d74be..a9e2f422b9 100644 --- a/scene/resources/environment.h +++ b/scene/resources/environment.h @@ -61,6 +61,7 @@ public: }; enum Fx { + FX_AMBIENT_LIGHT=VS::ENV_FX_AMBIENT_LIGHT, FX_FXAA=VS::ENV_FX_FXAA, FX_GLOW=VS::ENV_FX_GLOW, FX_DOF_BLUR=VS::ENV_FX_DOF_BLUR, @@ -77,7 +78,16 @@ public: FX_BLUR_BLEND_MODE_SOFTLIGHT, }; + enum FxHDRToneMapper { + FX_HDR_TONE_MAPPER_LINEAR, + FX_HDR_TONE_MAPPER_LOG, + FX_HDR_TONE_MAPPER_REINHARDT, + FX_HDR_TONE_MAPPER_REINHARDT_AUTOWHITE, + }; + enum FxParam { + FX_PARAM_AMBIENT_LIGHT_COLOR=VS::ENV_FX_PARAM_AMBIENT_LIGHT_COLOR, + FX_PARAM_AMBIENT_LIGHT_ENERGY=VS::ENV_FX_PARAM_AMBIENT_LIGHT_ENERGY, FX_PARAM_GLOW_BLUR_PASSES=VS::ENV_FX_PARAM_GLOW_BLUR_PASSES, FX_PARAM_GLOW_BLUR_SCALE=VS::ENV_FX_PARAM_GLOW_BLUR_SCALE, FX_PARAM_GLOW_BLUR_STRENGTH=VS::ENV_FX_PARAM_GLOW_BLUR_STRENGTH, @@ -88,7 +98,8 @@ public: FX_PARAM_DOF_BLUR_BEGIN=VS::ENV_FX_PARAM_DOF_BLUR_BEGIN, FX_PARAM_DOF_BLUR_RANGE=VS::ENV_FX_PARAM_DOF_BLUR_RANGE, FX_PARAM_HDR_EXPOSURE=VS::ENV_FX_PARAM_HDR_EXPOSURE, - FX_PARAM_HDR_SCALAR=VS::ENV_FX_PARAM_HDR_SCALAR, + FX_PARAM_HDR_TONEMAPPER=VS::ENV_FX_PARAM_HDR_TONEMAPPER, + FX_PARAM_HDR_WHITE=VS::ENV_FX_PARAM_HDR_WHITE, FX_PARAM_HDR_GLOW_TRESHOLD=VS::ENV_FX_PARAM_HDR_GLOW_TRESHOLD, FX_PARAM_HDR_GLOW_SCALE=VS::ENV_FX_PARAM_HDR_GLOW_SCALE, FX_PARAM_HDR_MIN_LUMINANCE=VS::ENV_FX_PARAM_HDR_MIN_LUMINANCE, |