diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-02 21:38:20 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-02 21:52:26 +0100 |
| commit | 3f3f5a5359973e95e94148676a9793d6f52468f3 (patch) | |
| tree | 65adf17c3d3f8d3a83bec29f51142fe884e942d8 /doc | |
| parent | db46a344180d4eae1455e97e22bf84c9c304be7c (diff) | |
| parent | 2820b2d82b2ed747011e37c543aefc6d4d4edee9 (diff) | |
Merge remote-tracking branch 'origin/gles3' into gles3-on-master
Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/base/classes.xml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/doc/base/classes.xml b/doc/base/classes.xml index d637127823..b49c23f117 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -13448,12 +13448,12 @@ </theme_item> </theme_items> </class> -<class name="FixedMaterial" inherits="Material" category="Core"> +<class name="FixedSpatialMaterial" inherits="Material" category="Core"> <brief_description> Simple Material with a fixed parameter set. </brief_description> <description> - FixedMaterial is a simple type of material [Resource], which contains a fixed amount of parameters. It is the only type of material supported in fixed-pipeline devices and APIs. It is also an often a better alternative to [ShaderMaterial] for most simple use cases. + FixedSpatialMaterial is a simple type of material [Resource], which contains a fixed amount of parameters. It is the only type of material supported in fixed-pipeline devices and APIs. It is also an often a better alternative to [ShaderMaterial] for most simple use cases. </description> <methods> <method name="get_fixed_flag" qualifiers="const"> @@ -16342,15 +16342,15 @@ </constant> <constant name="COMPRESS_ETC" value="3"> </constant> - <constant name="FORMAT_GRAYSCALE" value="0"> + <constant name="FORMAT_L8" value="0"> </constant> <constant name="FORMAT_INTENSITY" value="1"> </constant> - <constant name="FORMAT_GRAYSCALE_ALPHA" value="2"> + <constant name="FORMAT_LA8" value="2"> </constant> - <constant name="FORMAT_RGB" value="3"> + <constant name="FORMAT_RGB8" value="3"> </constant> - <constant name="FORMAT_RGBA" value="4"> + <constant name="FORMAT_RGBA8" value="4"> </constant> <constant name="FORMAT_INDEXED" value="5"> </constant> @@ -16360,23 +16360,23 @@ </constant> <constant name="FORMAT_YUV_444" value="8"> </constant> - <constant name="FORMAT_BC1" value="9"> + <constant name="FORMAT_DXT1" value="9"> </constant> - <constant name="FORMAT_BC2" value="10"> + <constant name="FORMAT_DXT3" value="10"> </constant> - <constant name="FORMAT_BC3" value="11"> + <constant name="FORMAT_DXT5" value="11"> </constant> - <constant name="FORMAT_BC4" value="12"> + <constant name="FORMAT_ATI1" value="12"> </constant> - <constant name="FORMAT_BC5" value="13"> + <constant name="FORMAT_ATI2" value="13"> </constant> <constant name="FORMAT_PVRTC2" value="14"> </constant> - <constant name="FORMAT_PVRTC2_ALPHA" value="15"> + <constant name="FORMAT_PVRTC2A" value="15"> </constant> <constant name="FORMAT_PVRTC4" value="16"> </constant> - <constant name="FORMAT_PVRTC4_ALPHA" value="17"> + <constant name="FORMAT_PVRTC4A" value="17"> </constant> <constant name="FORMAT_ETC" value="18"> </constant> |