maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #22053 from akien-mga/animtexture-frame-internal

Browse source 
Mark AnimatedTexture frame_* properties as internal
This commit is contained in:
Rémi Verschelde 2018-09-14 09:12:40 +02:00 committed by GitHub
parent a6c02c2320 cd0b82fd56
commit d05fe05680
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 1029 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1060
doc/classes/AnimatedTexture.xml
View file

File diff suppressed because it is too large Load diff

2
doc/classes/StreamPeerTCP.xml
View file

@ -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>

6
scene/resources/texture.cpp
View file

@ -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);
}
}

3
scene/resources/texture.h
View file

@ -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>
*/