From ab6eaa3de48fb4148ed7f5f51a8fc05a04a69bc4 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sun, 12 Apr 2015 15:40:08 -0300 Subject: renamed scrts to scripts, fixes #1525 --- demos/2d/screen_space_shaders/engine.cfg | 1 + demos/2d/screen_space_shaders/screen_shaders.scn | Bin 5762 -> 5896 bytes tools/scripts/makeargs.py | 88 +++++++++++++++++++++++ tools/scrits/makeargs.py | 88 ----------------------- 4 files changed, 89 insertions(+), 88 deletions(-) create mode 100644 tools/scripts/makeargs.py delete mode 100644 tools/scrits/makeargs.py diff --git a/demos/2d/screen_space_shaders/engine.cfg b/demos/2d/screen_space_shaders/engine.cfg index 2a41110886..108fdeba34 100644 --- a/demos/2d/screen_space_shaders/engine.cfg +++ b/demos/2d/screen_space_shaders/engine.cfg @@ -2,3 +2,4 @@ name="Screen-Space Shaders" main_scene="res://screen_shaders.scn" + diff --git a/demos/2d/screen_space_shaders/screen_shaders.scn b/demos/2d/screen_space_shaders/screen_shaders.scn index aa359616de..cc62ac8203 100644 Binary files a/demos/2d/screen_space_shaders/screen_shaders.scn and b/demos/2d/screen_space_shaders/screen_shaders.scn differ diff --git a/tools/scripts/makeargs.py b/tools/scripts/makeargs.py new file mode 100644 index 0000000000..6f7afa6328 --- /dev/null +++ b/tools/scripts/makeargs.py @@ -0,0 +1,88 @@ + +text=""" +#define FUNC$numR(m_r,m_func,$argt)\\ + virtual m_r m_func($argtp) { \\ + if (Thread::get_caller_ID()!=server_thread) {\\ + m_r ret;\\ + command_queue.push_and_ret( visual_server, &VisualServer::m_func,$argp,&ret);\\ + return ret;\\ + } else {\\ + return visual_server->m_func($argp);\\ + }\\ + } + +#define FUNC$numRC(m_r,m_func,$argt)\\ + virtual m_r m_func($argtp) const { \\ + if (Thread::get_caller_ID()!=server_thread) {\\ + m_r ret;\\ + command_queue.push_and_ret( visual_server, &VisualServer::m_func,$argp,&ret);\\ + return ret;\\ + } else {\\ + return visual_server->m_func($argp);\\ + }\\ + } + + +#define FUNC$numS(m_func,$argt)\\ + virtual void m_func($argtp) { \\ + if (Thread::get_caller_ID()!=server_thread) {\\ + command_queue.push_and_sync( visual_server, &VisualServer::m_func,$argp);\\ + } else {\\ + visual_server->m_func($argp);\\ + }\\ + } + +#define FUNC$numSC(m_func,$argt)\\ + virtual void m_func($argtp) const { \\ + if (Thread::get_caller_ID()!=server_thread) {\\ + command_queue.push_and_sync( visual_server, &VisualServer::m_func,$argp);\\ + } else {\\ + visual_server->m_func($argp);\\ + }\\ + } + + +#define FUNC$num(m_func,$argt)\\ + virtual void m_func($argtp) { \\ + if (Thread::get_caller_ID()!=server_thread) {\\ + command_queue.push( visual_server, &VisualServer::m_func,$argp);\\ + } else {\\ + visual_server->m_func($argp);\\ + }\\ + } + +#define FUNC$numC(m_func,$argt)\\ + virtual void m_func($argtp) const { \\ + if (Thread::get_caller_ID()!=server_thread) {\\ + command_queue.push( visual_server, &VisualServer::m_func,$argp);\\ + } else {\\ + visual_server->m_func($argp);\\ + }\\ + } + + +""" + + + +for i in range(1,8): + + tp="" + p="" + t="" + for j in range(i): + if (j>0): + tp+=", " + p+=", " + t+=", " + tp +=("m_arg"+str(j+1)+" p"+str(j+1)) + p+=("p"+str(j+1)) + t+=("m_arg"+str(j+1)) + + t = text.replace("$argtp",tp).replace("$argp",p).replace("$argt",t).replace("$num",str(i)) + print(t) + + + + + diff --git a/tools/scrits/makeargs.py b/tools/scrits/makeargs.py deleted file mode 100644 index 6f7afa6328..0000000000 --- a/tools/scrits/makeargs.py +++ /dev/null @@ -1,88 +0,0 @@ - -text=""" -#define FUNC$numR(m_r,m_func,$argt)\\ - virtual m_r m_func($argtp) { \\ - if (Thread::get_caller_ID()!=server_thread) {\\ - m_r ret;\\ - command_queue.push_and_ret( visual_server, &VisualServer::m_func,$argp,&ret);\\ - return ret;\\ - } else {\\ - return visual_server->m_func($argp);\\ - }\\ - } - -#define FUNC$numRC(m_r,m_func,$argt)\\ - virtual m_r m_func($argtp) const { \\ - if (Thread::get_caller_ID()!=server_thread) {\\ - m_r ret;\\ - command_queue.push_and_ret( visual_server, &VisualServer::m_func,$argp,&ret);\\ - return ret;\\ - } else {\\ - return visual_server->m_func($argp);\\ - }\\ - } - - -#define FUNC$numS(m_func,$argt)\\ - virtual void m_func($argtp) { \\ - if (Thread::get_caller_ID()!=server_thread) {\\ - command_queue.push_and_sync( visual_server, &VisualServer::m_func,$argp);\\ - } else {\\ - visual_server->m_func($argp);\\ - }\\ - } - -#define FUNC$numSC(m_func,$argt)\\ - virtual void m_func($argtp) const { \\ - if (Thread::get_caller_ID()!=server_thread) {\\ - command_queue.push_and_sync( visual_server, &VisualServer::m_func,$argp);\\ - } else {\\ - visual_server->m_func($argp);\\ - }\\ - } - - -#define FUNC$num(m_func,$argt)\\ - virtual void m_func($argtp) { \\ - if (Thread::get_caller_ID()!=server_thread) {\\ - command_queue.push( visual_server, &VisualServer::m_func,$argp);\\ - } else {\\ - visual_server->m_func($argp);\\ - }\\ - } - -#define FUNC$numC(m_func,$argt)\\ - virtual void m_func($argtp) const { \\ - if (Thread::get_caller_ID()!=server_thread) {\\ - command_queue.push( visual_server, &VisualServer::m_func,$argp);\\ - } else {\\ - visual_server->m_func($argp);\\ - }\\ - } - - -""" - - - -for i in range(1,8): - - tp="" - p="" - t="" - for j in range(i): - if (j>0): - tp+=", " - p+=", " - t+=", " - tp +=("m_arg"+str(j+1)+" p"+str(j+1)) - p+=("p"+str(j+1)) - t+=("m_arg"+str(j+1)) - - t = text.replace("$argtp",tp).replace("$argp",p).replace("$argt",t).replace("$num",str(i)) - print(t) - - - - - -- cgit v1.2.3