seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12572 from RandomShaper/onion-skinning

Browse Source 
Onion skinning
This commit is contained in:
Juan Linietsky
2017-11-26 15:13:35 -03:00
committed by GitHub
parent 9cf44c1c53 d0e09d84f0
commit 22415e5a31
33 changed files with 774 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
servers/visual/rasterizer.h
View File

@ -1027,7 +1027,7 @@ public:
virtual void restore_render_target() = 0;
virtual void clear_render_target(const Color &p_color) = 0;
virtual void blit_render_target_to_screen(RID p_render_target, const Rect2 &p_screen_rect, int p_screen = 0) = 0;
virtual void end_frame() = 0;
virtual void end_frame(bool p_swap_buffers) = 0;
virtual void finalize() = 0;
virtual ~Rasterizer() {}

4
servers/visual/visual_server_raster.cpp
View File

@ -92,7 +92,7 @@ void VisualServerRaster::request_frame_drawn_callback(Object *p_where, const Str
frame_drawn_callbacks.push_back(fdc);
}
void VisualServerRaster::draw() {
void VisualServerRaster::draw(bool p_swap_buffers) {
changes = 0;
@ -103,7 +103,7 @@ void VisualServerRaster::draw() {
VSG::viewport->draw_viewports();
VSG::scene->render_probes();
_draw_margins();
VSG::rasterizer->end_frame();
VSG::rasterizer->end_frame(p_swap_buffers);
while (frame_drawn_callbacks.front()) {

12
servers/visual/visual_server_raster.h
View File

@ -77,8 +77,8 @@ class VisualServerRaster : public VisualServer {
static void _changes_changed() {}
public:
//if editor is redrawing when it shouldn't, enable this and put a breakpoint in _changes_changed()
//#define DEBUG_CHANGES
//if editor is redrawing when it shouldn't, enable this and put a breakpoint in _changes_changed()
//#define DEBUG_CHANGES
#ifdef DEBUG_CHANGES
_FORCE_INLINE_ static void redraw_request() {
@ -96,7 +96,7 @@ public:
#define DISPLAY_CHANGED \
changes++;
#endif
// print_line(String("CHANGED: ") + __FUNCTION__);
// print_line(String("CHANGED: ") + __FUNCTION__);
#define BIND0R(m_r, m_name) \
m_r m_name() { return BINDBASE->m_name(); }
@ -449,7 +449,7 @@ public:
BIND2R(int, viewport_get_render_info, RID, ViewportRenderInfo)
BIND2(viewport_set_debug_draw, RID, ViewportDebugDraw)
/* ENVIRONMENT API */
/* ENVIRONMENT API */
#undef BINDBASE
//from now on, calls forwarded to this singleton
@ -479,7 +479,7 @@ public:
BIND6(environment_set_fog_depth, RID, bool, float, float, bool, float)
BIND5(environment_set_fog_height, RID, bool, float, float, float)
/* SCENARIO API */
/* SCENARIO API */
#undef BINDBASE
#define BINDBASE VSG::scene
@ -625,7 +625,7 @@ public:
virtual void request_frame_drawn_callback(Object *p_where, const StringName &p_method, const Variant &p_userdata);
virtual void draw();
virtual void draw(bool p_swap_buffers);
virtual void sync();
virtual bool has_changed() const;
virtual void init();

4
servers/visual/visual_server_wrap_mt.cpp
View File

@ -89,7 +89,7 @@ void VisualServerWrapMT::sync() {
}
}
void VisualServerWrapMT::draw() {
void VisualServerWrapMT::draw(bool p_swap_buffers) {
if (create_thread) {
@ -97,7 +97,7 @@ void VisualServerWrapMT::draw() {
command_queue.push(this, &VisualServerWrapMT::thread_draw);
} else {
visual_server->draw();
visual_server->draw(p_swap_buffers);
}
}

4
servers/visual/visual_server_wrap_mt.h
View File

@ -62,7 +62,7 @@ class VisualServerWrapMT : public VisualServer {
int pool_max_size;
//#define DEBUG_SYNC
//#define DEBUG_SYNC
#ifdef DEBUG_SYNC
#define SYNC_DEBUG print_line("sync on: " + String(__FUNCTION__));
@ -542,7 +542,7 @@ public:
virtual void init();
virtual void finish();
virtual void draw();
virtual void draw(bool p_swap_buffers);
virtual void sync();
FUNC0RC(bool, has_changed)

4
servers/visual_server.cpp
View File

@ -1481,7 +1481,7 @@ Array VisualServer::_mesh_surface_get_skeleton_aabb_bind(RID p_mesh, int p_surfa
void VisualServer::_bind_methods() {
ClassDB::bind_method(D_METHOD("force_sync"), &VisualServer::sync);
ClassDB::bind_method(D_METHOD("force_draw"), &VisualServer::draw);
ClassDB::bind_method(D_METHOD("force_draw"), &VisualServer::draw, DEFVAL(true));
ClassDB::bind_method(D_METHOD("texture_create"), &VisualServer::texture_create);
ClassDB::bind_method(D_METHOD("texture_create_from_image", "image", "flags"), &VisualServer::texture_create_from_image, DEFVAL(TEXTURE_FLAGS_DEFAULT));
@ -1658,7 +1658,7 @@ void VisualServer::_bind_methods() {
ClassDB::bind_method(D_METHOD("free", "rid"), &VisualServer::free);
ClassDB::bind_method(D_METHOD("request_frame_drawn_callback", "where", "method", "userdata"), &VisualServer::request_frame_drawn_callback);
ClassDB::bind_method(D_METHOD("draw"), &VisualServer::draw);
ClassDB::bind_method(D_METHOD("draw"), &VisualServer::draw, DEFVAL(true));
ClassDB::bind_method(D_METHOD("sync"), &VisualServer::sync);
ClassDB::bind_method(D_METHOD("has_changed"), &VisualServer::has_changed);
ClassDB::bind_method(D_METHOD("init"), &VisualServer::init);

2
servers/visual_server.h
View File

@ -909,7 +909,7 @@ public:
/* EVENT QUEUING */
virtual void draw() = 0;
virtual void draw(bool p_swap_buffers = true) = 0;
virtual void sync() = 0;
virtual bool has_changed() const = 0;
virtual void init() = 0;