summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/classes/AnimatedTexture.xml1060
-rw-r--r--doc/classes/StreamPeerTCP.xml2
-rw-r--r--drivers/dummy/rasterizer_dummy.h1
-rw-r--r--drivers/gles2/rasterizer_storage_gles2.cpp13
-rw-r--r--drivers/gles2/rasterizer_storage_gles2.h1
-rw-r--r--drivers/gles3/rasterizer_storage_gles3.cpp14
-rw-r--r--drivers/gles3/rasterizer_storage_gles3.h1
-rw-r--r--modules/gdnative/gdnative/variant.cpp18
-rw-r--r--modules/gdnative/gdnative_api.json18
-rw-r--r--modules/gdnative/include/gdnative/variant.h44
-rw-r--r--scene/resources/material.cpp27
-rw-r--r--scene/resources/material.h2
-rw-r--r--scene/resources/texture.cpp6
-rw-r--r--scene/resources/texture.h3
-rw-r--r--servers/visual/rasterizer.h1
-rw-r--r--servers/visual/shader_language.cpp84
-rw-r--r--servers/visual/shader_language.h1
-rw-r--r--servers/visual/visual_server_raster.h1
-rw-r--r--servers/visual/visual_server_wrap_mt.h1
-rw-r--r--servers/visual_server.cpp1
-rw-r--r--servers/visual_server.h1
21 files changed, 270 insertions, 1030 deletions
diff --git a/doc/classes/AnimatedTexture.xml b/doc/classes/AnimatedTexture.xml
index f874c43ef1..9dc58ed195 100644
--- a/doc/classes/AnimatedTexture.xml
+++ b/doc/classes/AnimatedTexture.xml
@@ -9,1034 +9,46 @@
<demos>
</demos>
<methods>
+ <method name="get_frame_delay" qualifiers="const">
+ <return type="float">
+ </return>
+ <argument index="0" name="frame" type="int">
+ </argument>
+ <description>
+ </description>
+ </method>
+ <method name="get_frame_texture" qualifiers="const">
+ <return type="Texture">
+ </return>
+ <argument index="0" name="frame" type="int">
+ </argument>
+ <description>
+ </description>
+ </method>
+ <method name="set_frame_delay">
+ <return type="void">
+ </return>
+ <argument index="0" name="frame" type="int">
+ </argument>
+ <argument index="1" name="delay" type="float">
+ </argument>
+ <description>
+ </description>
+ </method>
+ <method name="set_frame_texture">
+ <return type="void">
+ </return>
+ <argument index="0" name="frame" type="int">
+ </argument>
+ <argument index="1" name="texture" type="Texture">
+ </argument>
+ <description>
+ </description>
+ </method>
</methods>
<members>
<member name="fps" type="float" setter="set_fps" getter="get_fps">
</member>
- <member name="frame_0/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_0/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_1/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_1/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_10/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_10/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_100/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_100/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_101/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_101/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_102/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_102/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_103/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_103/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_104/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_104/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_105/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_105/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_106/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_106/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_107/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_107/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_108/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_108/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_109/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_109/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_11/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_11/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_110/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_110/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_111/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_111/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_112/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_112/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_113/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_113/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_114/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_114/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_115/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_115/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_116/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_116/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_117/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_117/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_118/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_118/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_119/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_119/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_12/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_12/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_120/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_120/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_121/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_121/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_122/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_122/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_123/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_123/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_124/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_124/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_125/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_125/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_126/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_126/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_127/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_127/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_128/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_128/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_129/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_129/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_13/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_13/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_130/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_130/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_131/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_131/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_132/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_132/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_133/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_133/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_134/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_134/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_135/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_135/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_136/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_136/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_137/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_137/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_138/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_138/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_139/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_139/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_14/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_14/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_140/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_140/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_141/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_141/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_142/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_142/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_143/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_143/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_144/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_144/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_145/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_145/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_146/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_146/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_147/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_147/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_148/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_148/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_149/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_149/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_15/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_15/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_150/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_150/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_151/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_151/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_152/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_152/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_153/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_153/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_154/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_154/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_155/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_155/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_156/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_156/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_157/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_157/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_158/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_158/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_159/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_159/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_16/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_16/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_160/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_160/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_161/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_161/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_162/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_162/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_163/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_163/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_164/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_164/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_165/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_165/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_166/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_166/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_167/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_167/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_168/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_168/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_169/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_169/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_17/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_17/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_170/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_170/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_171/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_171/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_172/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_172/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_173/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_173/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_174/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_174/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_175/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_175/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_176/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_176/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_177/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_177/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_178/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_178/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_179/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_179/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_18/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_18/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_180/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_180/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_181/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_181/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_182/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_182/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_183/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_183/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_184/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_184/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_185/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_185/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_186/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_186/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_187/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_187/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_188/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_188/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_189/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_189/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_19/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_19/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_190/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_190/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_191/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_191/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_192/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_192/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_193/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_193/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_194/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_194/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_195/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_195/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_196/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_196/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_197/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_197/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_198/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_198/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_199/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_199/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_2/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_2/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_20/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_20/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_200/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_200/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_201/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_201/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_202/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_202/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_203/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_203/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_204/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_204/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_205/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_205/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_206/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_206/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_207/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_207/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_208/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_208/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_209/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_209/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_21/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_21/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_210/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_210/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_211/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_211/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_212/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_212/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_213/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_213/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_214/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_214/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_215/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_215/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_216/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_216/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_217/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_217/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_218/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_218/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_219/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_219/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_22/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_22/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_220/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_220/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_221/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_221/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_222/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_222/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_223/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_223/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_224/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_224/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_225/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_225/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_226/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_226/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_227/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_227/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_228/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_228/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_229/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_229/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_23/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_23/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_230/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_230/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_231/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_231/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_232/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_232/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_233/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_233/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_234/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_234/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_235/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_235/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_236/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_236/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_237/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_237/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_238/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_238/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_239/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_239/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_24/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_24/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_240/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_240/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_241/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_241/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_242/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_242/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_243/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_243/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_244/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_244/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_245/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_245/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_246/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_246/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_247/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_247/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_248/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_248/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_249/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_249/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_25/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_25/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_250/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_250/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_251/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_251/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_252/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_252/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_253/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_253/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_254/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_254/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_255/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_255/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_26/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_26/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_27/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_27/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_28/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_28/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_29/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_29/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_3/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_3/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_30/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_30/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_31/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_31/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_32/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_32/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_33/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_33/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_34/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_34/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_35/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_35/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_36/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_36/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_37/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_37/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_38/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_38/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_39/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_39/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_4/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_4/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_40/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_40/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_41/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_41/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_42/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_42/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_43/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_43/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_44/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_44/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_45/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_45/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_46/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_46/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_47/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_47/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_48/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_48/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_49/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_49/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_5/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_5/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_50/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_50/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_51/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_51/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_52/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_52/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_53/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_53/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_54/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_54/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_55/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_55/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_56/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_56/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_57/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_57/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_58/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_58/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_59/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_59/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_6/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_6/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_60/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_60/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_61/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_61/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_62/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_62/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_63/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_63/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_64/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_64/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_65/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_65/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_66/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_66/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_67/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_67/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_68/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_68/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_69/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_69/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_7/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_7/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_70/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_70/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_71/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_71/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_72/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_72/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_73/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_73/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_74/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_74/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_75/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_75/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_76/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_76/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_77/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_77/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_78/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_78/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_79/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_79/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_8/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_8/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_80/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_80/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_81/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_81/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_82/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_82/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_83/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_83/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_84/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_84/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_85/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_85/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_86/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_86/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_87/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_87/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_88/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_88/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_89/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_89/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_9/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_9/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_90/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_90/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_91/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_91/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_92/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_92/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_93/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_93/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_94/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_94/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_95/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_95/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_96/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_96/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_97/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_97/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_98/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_98/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
- <member name="frame_99/delay_sec" type="float" setter="set_frame_delay" getter="get_frame_delay">
- </member>
- <member name="frame_99/texture" type="Texture" setter="set_frame_texture" getter="get_frame_texture">
- </member>
<member name="frames" type="int" setter="set_frames" getter="get_frames">
</member>
</members>
diff --git a/doc/classes/StreamPeerTCP.xml b/doc/classes/StreamPeerTCP.xml
index e1f1dcb8fa..664ffc60c3 100644
--- a/doc/classes/StreamPeerTCP.xml
+++ b/doc/classes/StreamPeerTCP.xml
@@ -43,7 +43,7 @@
Return the port of this peer.
</description>
</method>
- <method name="get_status" qualifiers="const">
+ <method name="get_status">
<return type="int" enum="StreamPeerTCP.Status">
</return>
<description>
diff --git a/drivers/dummy/rasterizer_dummy.h b/drivers/dummy/rasterizer_dummy.h
index bb4511ecc3..126f23feeb 100644
--- a/drivers/dummy/rasterizer_dummy.h
+++ b/drivers/dummy/rasterizer_dummy.h
@@ -267,6 +267,7 @@ public:
void material_set_param(RID p_material, const StringName &p_param, const Variant &p_value) {}
Variant material_get_param(RID p_material, const StringName &p_param) const { return Variant(); }
+ Variant material_get_param_default(RID p_material, const StringName &p_param) const { return Variant(); }
void material_set_line_width(RID p_material, float p_width) {}
diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp
index fdc110be9e..d945132dc2 100644
--- a/drivers/gles2/rasterizer_storage_gles2.cpp
+++ b/drivers/gles2/rasterizer_storage_gles2.cpp
@@ -1419,6 +1419,19 @@ Variant RasterizerStorageGLES2::material_get_param(RID p_material, const StringN
return material->params[p_param];
}
+ return material_get_param_default(p_material, p_param);
+}
+
+Variant RasterizerStorageGLES2::material_get_param_default(RID p_material, const StringName &p_param) const {
+ const Material *material = material_owner.get(p_material);
+ ERR_FAIL_COND_V(!material, Variant());
+
+ if (material->shader) {
+ if (material->shader->uniforms.has(p_param)) {
+ Vector<ShaderLanguage::ConstantNode::Value> default_value = material->shader->uniforms[p_param].default_value;
+ return ShaderLanguage::constant_value_to_variant(default_value, material->shader->uniforms[p_param].type);
+ }
+ }
return Variant();
}
diff --git a/drivers/gles2/rasterizer_storage_gles2.h b/drivers/gles2/rasterizer_storage_gles2.h
index e42eb67d3d..d9bf6b3ccb 100644
--- a/drivers/gles2/rasterizer_storage_gles2.h
+++ b/drivers/gles2/rasterizer_storage_gles2.h
@@ -563,6 +563,7 @@ public:
virtual void material_set_param(RID p_material, const StringName &p_param, const Variant &p_value);
virtual Variant material_get_param(RID p_material, const StringName &p_param) const;
+ virtual Variant material_get_param_default(RID p_material, const StringName &p_param) const;
virtual void material_set_line_width(RID p_material, float p_width);
virtual void material_set_next_pass(RID p_material, RID p_next_material);
diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp
index c05f4cfbe3..25e7bd0424 100644
--- a/drivers/gles3/rasterizer_storage_gles3.cpp
+++ b/drivers/gles3/rasterizer_storage_gles3.cpp
@@ -29,7 +29,6 @@
/*************************************************************************/
#include "rasterizer_storage_gles3.h"
-
#include "core/engine.h"
#include "core/project_settings.h"
#include "rasterizer_canvas_gles3.h"
@@ -2140,6 +2139,19 @@ Variant RasterizerStorageGLES3::material_get_param(RID p_material, const StringN
if (material->params.has(p_param))
return material->params[p_param];
+ return material_get_param_default(p_material, p_param);
+}
+
+Variant RasterizerStorageGLES3::material_get_param_default(RID p_material, const StringName &p_param) const {
+ const Material *material = material_owner.get(p_material);
+ ERR_FAIL_COND_V(!material, Variant());
+
+ if (material->shader) {
+ if (material->shader->uniforms.has(p_param)) {
+ Vector<ShaderLanguage::ConstantNode::Value> default_value = material->shader->uniforms[p_param].default_value;
+ return ShaderLanguage::constant_value_to_variant(default_value, material->shader->uniforms[p_param].type);
+ }
+ }
return Variant();
}
diff --git a/drivers/gles3/rasterizer_storage_gles3.h b/drivers/gles3/rasterizer_storage_gles3.h
index 33f0853d60..0bd9c22be5 100644
--- a/drivers/gles3/rasterizer_storage_gles3.h
+++ b/drivers/gles3/rasterizer_storage_gles3.h
@@ -583,6 +583,7 @@ public:
virtual void material_set_param(RID p_material, const StringName &p_param, const Variant &p_value);
virtual Variant material_get_param(RID p_material, const StringName &p_param) const;
+ virtual Variant material_get_param_default(RID p_material, const StringName &p_param) const;
virtual void material_set_line_width(RID p_material, float p_width);
virtual void material_set_next_pass(RID p_material, RID p_next_material);
diff --git a/modules/gdnative/gdnative/variant.cpp b/modules/gdnative/gdnative/variant.cpp
index 423f3312e1..fd6babfc3a 100644
--- a/modules/gdnative/gdnative/variant.cpp
+++ b/modules/gdnative/gdnative/variant.cpp
@@ -489,6 +489,24 @@ void GDAPI godot_variant_destroy(godot_variant *p_self) {
self->~Variant();
}
+// GDNative core 1.1
+
+godot_string GDAPI godot_variant_get_operator_name(godot_variant_operator p_op) {
+ Variant::Operator op = (Variant::Operator)p_op;
+ godot_string raw_dest;
+ String *dest = (String *)&raw_dest;
+ memnew_placement(dest, String(Variant::get_operator_name(op))); // operator = is overloaded by String
+ return raw_dest;
+}
+
+void GDAPI godot_variant_evaluate(godot_variant_operator p_op, const godot_variant *p_a, const godot_variant *p_b, godot_variant *r_ret, godot_bool *r_valid) {
+ Variant::Operator op = (Variant::Operator)p_op;
+ const Variant *a = (const Variant *)p_a;
+ const Variant *b = (const Variant *)p_b;
+ Variant *ret = (Variant *)r_ret;
+ Variant::evaluate(op, a, b, *ret, *r_valid);
+}
+
#ifdef __cplusplus
}
#endif
diff --git a/modules/gdnative/gdnative_api.json b/modules/gdnative/gdnative_api.json
index dce3d7e96b..16a34a9a33 100644
--- a/modules/gdnative/gdnative_api.json
+++ b/modules/gdnative/gdnative_api.json
@@ -94,6 +94,24 @@
["godot_transform *", "r_dest"],
["const godot_quat *", "p_quat"]
]
+ },
+ {
+ "name": "godot_variant_get_operator_name",
+ "return_type": "godot_string",
+ "arguments": [
+ ["godot_variant_operator", "p_op"]
+ ]
+ },
+ {
+ "name": "godot_variant_evaluate",
+ "return_type": "void",
+ "arguments": [
+ ["godot_variant_operator", "p_op"],
+ ["const godot_variant *", "p_a"],
+ ["const godot_variant *", "p_b"],
+ ["godot_variant *", "r_ret"],
+ ["godot_bool *", "r_valid"]
+ ]
}
]
},
diff --git a/modules/gdnative/include/gdnative/variant.h b/modules/gdnative/include/gdnative/variant.h
index 6779dc4092..5e71aa9f11 100644
--- a/modules/gdnative/include/gdnative/variant.h
+++ b/modules/gdnative/include/gdnative/variant.h
@@ -100,6 +100,45 @@ typedef struct godot_variant_call_error {
godot_variant_type expected;
} godot_variant_call_error;
+typedef enum godot_variant_operator {
+ // comparison
+ GODOT_VARIANT_OP_EQUAL,
+ GODOT_VARIANT_OP_NOT_EQUAL,
+ GODOT_VARIANT_OP_LESS,
+ GODOT_VARIANT_OP_LESS_EQUAL,
+ GODOT_VARIANT_OP_GREATER,
+ GODOT_VARIANT_OP_GREATER_EQUAL,
+
+ // mathematic
+ GODOT_VARIANT_OP_ADD,
+ GODOT_VARIANT_OP_SUBTRACT,
+ GODOT_VARIANT_OP_MULTIPLY,
+ GODOT_VARIANT_OP_DIVIDE,
+ GODOT_VARIANT_OP_NEGATE,
+ GODOT_VARIANT_OP_POSITIVE,
+ GODOT_VARIANT_OP_MODULE,
+ GODOT_VARIANT_OP_STRING_CONCAT,
+
+ // bitwise
+ GODOT_VARIANT_OP_SHIFT_LEFT,
+ GODOT_VARIANT_OP_SHIFT_RIGHT,
+ GODOT_VARIANT_OP_BIT_AND,
+ GODOT_VARIANT_OP_BIT_OR,
+ GODOT_VARIANT_OP_BIT_XOR,
+ GODOT_VARIANT_OP_BIT_NEGATE,
+
+ // logic
+ GODOT_VARIANT_OP_AND,
+ GODOT_VARIANT_OP_OR,
+ GODOT_VARIANT_OP_XOR,
+ GODOT_VARIANT_OP_NOT,
+
+ // containment
+ GODOT_VARIANT_OP_IN,
+
+ GODOT_VARIANT_OP_MAX,
+} godot_variant_operator;
+
// reduce extern "C" nesting for VS2013
#ifdef __cplusplus
}
@@ -204,6 +243,11 @@ godot_bool GDAPI godot_variant_booleanize(const godot_variant *p_self);
void GDAPI godot_variant_destroy(godot_variant *p_self);
+// GDNative core 1.1
+
+godot_string GDAPI godot_variant_get_operator_name(godot_variant_operator p_op);
+void GDAPI godot_variant_evaluate(godot_variant_operator p_op, const godot_variant *p_a, const godot_variant *p_b, godot_variant *r_ret, godot_bool *r_valid);
+
#ifdef __cplusplus
}
#endif
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
index 4727526b68..2cf802a2da 100644
--- a/scene/resources/material.cpp
+++ b/scene/resources/material.cpp
@@ -145,6 +145,31 @@ void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const {
}
}
+bool ShaderMaterial::property_can_revert(const String &p_name) {
+ if (shader.is_valid()) {
+
+ StringName pr = shader->remap_param(p_name);
+ if (pr) {
+ Variant default_value = VisualServer::get_singleton()->material_get_param_default(_get_material(), pr);
+ Variant current_value;
+ _get(p_name, current_value);
+ return default_value.get_type() != Variant::NIL && default_value != current_value;
+ }
+ }
+ return false;
+}
+
+Variant ShaderMaterial::property_get_revert(const String &p_name) {
+ Variant r_ret;
+ if (shader.is_valid()) {
+ StringName pr = shader->remap_param(p_name);
+ if (pr) {
+ r_ret = VisualServer::get_singleton()->material_get_param_default(_get_material(), pr);
+ }
+ }
+ return r_ret;
+}
+
void ShaderMaterial::set_shader(const Ref<Shader> &p_shader) {
if (shader.is_valid()) {
@@ -190,6 +215,8 @@ void ShaderMaterial::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_shader_param", "param", "value"), &ShaderMaterial::set_shader_param);
ClassDB::bind_method(D_METHOD("get_shader_param", "param"), &ShaderMaterial::get_shader_param);
ClassDB::bind_method(D_METHOD("_shader_changed"), &ShaderMaterial::_shader_changed);
+ ClassDB::bind_method(D_METHOD("property_can_revert", "name"), &ShaderMaterial::property_can_revert);
+ ClassDB::bind_method(D_METHOD("property_get_revert", "name"), &ShaderMaterial::property_get_revert);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shader", PROPERTY_HINT_RESOURCE_TYPE, "Shader"), "set_shader", "get_shader");
}
diff --git a/scene/resources/material.h b/scene/resources/material.h
index 078649e7b0..4a2a813341 100644
--- a/scene/resources/material.h
+++ b/scene/resources/material.h
@@ -85,6 +85,8 @@ protected:
bool _set(const StringName &p_name, const Variant &p_value);
bool _get(const StringName &p_name, Variant &r_ret) const;
void _get_property_list(List<PropertyInfo> *p_list) const;
+ bool property_can_revert(const String &p_name);
+ Variant property_get_revert(const String &p_name);
static void _bind_methods();
diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp
index 9875c7b130..4fa20e7ad0 100644
--- a/scene/resources/texture.cpp
+++ b/scene/resources/texture.cpp
@@ -30,11 +30,11 @@
#include "texture.h"
-#include "bit_mask.h"
#include "core/core_string_names.h"
#include "core/io/image_loader.h"
#include "core/method_bind_ext.gen.inc"
#include "core/os/os.h"
+#include "scene/resources/bit_mask.h"
Size2 Texture::get_size() const {
@@ -1945,8 +1945,8 @@ void AnimatedTexture::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::REAL, "fps", PROPERTY_HINT_RANGE, "0,1024,0.1"), "set_fps", "get_fps");
for (int i = 0; i < MAX_FRAMES; i++) {
- ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "frame_" + itos(i) + "/texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_frame_texture", "get_frame_texture", i);
- ADD_PROPERTYI(PropertyInfo(Variant::REAL, "frame_" + itos(i) + "/delay_sec", PROPERTY_HINT_RANGE, "0.0,16.0,0.01"), "set_frame_delay", "get_frame_delay", i);
+ ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "frame_" + itos(i) + "/texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL), "set_frame_texture", "get_frame_texture", i);
+ ADD_PROPERTYI(PropertyInfo(Variant::REAL, "frame_" + itos(i) + "/delay_sec", PROPERTY_HINT_RANGE, "0.0,16.0,0.01", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL), "set_frame_delay", "get_frame_delay", i);
}
}
diff --git a/scene/resources/texture.h b/scene/resources/texture.h
index 4865f7b507..cb759c63da 100644
--- a/scene/resources/texture.h
+++ b/scene/resources/texture.h
@@ -37,9 +37,10 @@
#include "core/os/rw_lock.h"
#include "core/os/thread_safe.h"
#include "core/resource.h"
-#include "curve.h"
#include "scene/resources/color_ramp.h"
+#include "scene/resources/curve.h"
#include "servers/visual_server.h"
+
/**
@author Juan Linietsky <reduzio@gmail.com>
*/
diff --git a/servers/visual/rasterizer.h b/servers/visual/rasterizer.h
index c26f02f087..6eeaf12dfc 100644
--- a/servers/visual/rasterizer.h
+++ b/servers/visual/rasterizer.h
@@ -249,6 +249,7 @@ public:
virtual void material_set_param(RID p_material, const StringName &p_param, const Variant &p_value) = 0;
virtual Variant material_get_param(RID p_material, const StringName &p_param) const = 0;
+ virtual Variant material_get_param_default(RID p_material, const StringName &p_param) const = 0;
virtual void material_set_line_width(RID p_material, float p_width) = 0;
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp
index 8a8b8af267..35236b23f1 100644
--- a/servers/visual/shader_language.cpp
+++ b/servers/visual/shader_language.cpp
@@ -2273,6 +2273,90 @@ bool ShaderLanguage::is_sampler_type(DataType p_type) {
p_type == TYPE_SAMPLERCUBE;
}
+Variant ShaderLanguage::constant_value_to_variant(const Vector<ShaderLanguage::ConstantNode::Value> &p_value, DataType p_type) {
+ if (p_value.size() > 0) {
+ Variant value;
+ switch (p_type) {
+ case ShaderLanguage::TYPE_BOOL:
+ value = Variant(p_value[0].boolean);
+ break;
+ case ShaderLanguage::TYPE_BVEC2:
+ case ShaderLanguage::TYPE_BVEC3:
+ case ShaderLanguage::TYPE_BVEC4:
+ case ShaderLanguage::TYPE_INT:
+ value = Variant(p_value[0].sint);
+ break;
+ case ShaderLanguage::TYPE_IVEC2:
+ value = Variant(Vector2(p_value[0].sint, p_value[1].sint));
+ break;
+ case ShaderLanguage::TYPE_IVEC3:
+ value = Variant(Vector3(p_value[0].sint, p_value[1].sint, p_value[2].sint));
+ break;
+ case ShaderLanguage::TYPE_IVEC4:
+ value = Variant(Plane(p_value[0].sint, p_value[1].sint, p_value[2].sint, p_value[3].sint));
+ break;
+ case ShaderLanguage::TYPE_UINT:
+ value = Variant(p_value[0].uint);
+ break;
+ case ShaderLanguage::TYPE_UVEC2:
+ value = Variant(Vector2(p_value[0].uint, p_value[1].uint));
+ break;
+ case ShaderLanguage::TYPE_UVEC3:
+ value = Variant(Vector3(p_value[0].uint, p_value[1].uint, p_value[2].uint));
+ break;
+ case ShaderLanguage::TYPE_UVEC4:
+ value = Variant(Plane(p_value[0].uint, p_value[1].uint, p_value[2].uint, p_value[3].uint));
+ break;
+ case ShaderLanguage::TYPE_FLOAT:
+ value = Variant(p_value[0].real);
+ break;
+ case ShaderLanguage::TYPE_VEC2:
+ value = Variant(Vector2(p_value[0].real, p_value[1].real));
+ break;
+ case ShaderLanguage::TYPE_VEC3:
+ value = Variant(Vector3(p_value[0].real, p_value[1].real, p_value[2].real));
+ break;
+ case ShaderLanguage::TYPE_VEC4:
+ value = Variant(Plane(p_value[0].real, p_value[1].real, p_value[2].real, p_value[3].real));
+ break;
+ case ShaderLanguage::TYPE_MAT2:
+ value = Variant(Transform2D(p_value[0].real, p_value[2].real, p_value[1].real, p_value[3].real, 0.0, 0.0));
+ break;
+ case ShaderLanguage::TYPE_MAT3: {
+ Basis p;
+ p[0][0] = p_value[0].real;
+ p[0][1] = p_value[1].real;
+ p[0][2] = p_value[2].real;
+ p[1][0] = p_value[3].real;
+ p[1][1] = p_value[4].real;
+ p[1][2] = p_value[5].real;
+ p[2][0] = p_value[6].real;
+ p[2][1] = p_value[7].real;
+ p[2][2] = p_value[8].real;
+ value = Variant(p);
+ break;
+ }
+ case ShaderLanguage::TYPE_MAT4: {
+ Basis p;
+ p[0][0] = p_value[0].real;
+ p[0][1] = p_value[1].real;
+ p[0][2] = p_value[2].real;
+ p[1][0] = p_value[4].real;
+ p[1][1] = p_value[5].real;
+ p[1][2] = p_value[6].real;
+ p[2][0] = p_value[8].real;
+ p[2][1] = p_value[9].real;
+ p[2][2] = p_value[10].real;
+ Transform t = Transform(p, Vector3(p_value[3].real, p_value[7].real, p_value[11].real));
+ value = Variant(t);
+ break;
+ }
+ }
+ return value;
+ }
+ return Variant();
+}
+
void ShaderLanguage::get_keyword_list(List<String> *r_keywords) {
Set<String> kws;
diff --git a/servers/visual/shader_language.h b/servers/visual/shader_language.h
index e8ae099302..08c4d06992 100644
--- a/servers/visual/shader_language.h
+++ b/servers/visual/shader_language.h
@@ -548,6 +548,7 @@ public:
static int get_cardinality(DataType p_type);
static bool is_scalar_type(DataType p_type);
static bool is_sampler_type(DataType p_type);
+ static Variant constant_value_to_variant(const Vector<ShaderLanguage::ConstantNode::Value> &p_value, DataType p_type);
static void get_keyword_list(List<String> *r_keywords);
static void get_builtin_funcs(List<String> *r_keywords);
diff --git a/servers/visual/visual_server_raster.h b/servers/visual/visual_server_raster.h
index f25973c4e2..b54e150656 100644
--- a/servers/visual/visual_server_raster.h
+++ b/servers/visual/visual_server_raster.h
@@ -203,6 +203,7 @@ public:
BIND3(material_set_param, RID, const StringName &, const Variant &)
BIND2RC(Variant, material_get_param, RID, const StringName &)
+ BIND2RC(Variant, material_get_param_default, RID, const StringName &)
BIND2(material_set_render_priority, RID, int)
BIND2(material_set_line_width, RID, float)
diff --git a/servers/visual/visual_server_wrap_mt.h b/servers/visual/visual_server_wrap_mt.h
index 85205e5132..b8f86d7123 100644
--- a/servers/visual/visual_server_wrap_mt.h
+++ b/servers/visual/visual_server_wrap_mt.h
@@ -137,6 +137,7 @@ public:
FUNC3(material_set_param, RID, const StringName &, const Variant &)
FUNC2RC(Variant, material_get_param, RID, const StringName &)
+ FUNC2RC(Variant, material_get_param_default, RID, const StringName &)
FUNC2(material_set_render_priority, RID, int)
FUNC2(material_set_line_width, RID, float)
diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp
index d4e96bb173..7240266133 100644
--- a/servers/visual_server.cpp
+++ b/servers/visual_server.cpp
@@ -1695,6 +1695,7 @@ void VisualServer::_bind_methods() {
ClassDB::bind_method(D_METHOD("material_get_shader", "shader_material"), &VisualServer::material_get_shader);
ClassDB::bind_method(D_METHOD("material_set_param", "material", "parameter", "value"), &VisualServer::material_set_param);
ClassDB::bind_method(D_METHOD("material_get_param", "material", "parameter"), &VisualServer::material_get_param);
+ ClassDB::bind_method(D_METHOD("material_get_param_default", "material", "parameter"), &VisualServer::material_get_param_default);
ClassDB::bind_method(D_METHOD("material_set_render_priority", "material", "priority"), &VisualServer::material_set_render_priority);
ClassDB::bind_method(D_METHOD("material_set_line_width", "material", "width"), &VisualServer::material_set_line_width);
ClassDB::bind_method(D_METHOD("material_set_next_pass", "material", "next_material"), &VisualServer::material_set_next_pass);
diff --git a/servers/visual_server.h b/servers/visual_server.h
index 7c21d138e0..6a1f2c3550 100644
--- a/servers/visual_server.h
+++ b/servers/visual_server.h
@@ -209,6 +209,7 @@ public:
virtual void material_set_param(RID p_material, const StringName &p_param, const Variant &p_value) = 0;
virtual Variant material_get_param(RID p_material, const StringName &p_param) const = 0;
+ virtual Variant material_get_param_default(RID p_material, const StringName &p_param) const = 0;
virtual void material_set_render_priority(RID p_material, int priority) = 0;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-23 20:47:35 +0000