From 79e1aebfceb50f380a98c63271fd58111433a0f0 Mon Sep 17 00:00:00 2001 From: Seth Kingsley Date: Thu, 8 Nov 2018 16:26:39 -0800 Subject: [PATCH] Get rid of duplicate renamed files --- misc/raii/extract_raii.rb | 118 -------------------------------------- misc/raii/imgui_raii.h | 74 ------------------------ 2 files changed, 192 deletions(-) delete mode 100644 misc/raii/extract_raii.rb delete mode 100644 misc/raii/imgui_raii.h diff --git a/misc/raii/extract_raii.rb b/misc/raii/extract_raii.rb deleted file mode 100644 index e4f64d93c..000000000 --- a/misc/raii/extract_raii.rb +++ /dev/null @@ -1,118 +0,0 @@ -#!/usr/bin/env ruby - -$VERBOSE = 2 - -INDENT = ' ' * 4 - -puts <[\w\s]+\w)\s+(?\w*)\((?[^)]+)\)(?[^;]*);(?.*)$/) do |m| - next unless m[:name].match(/^(Begin|Push|Open|Tree|Column)/) - next unless m[:name].match(/^TreeNode|PushID|Begin$/) - - argnames = m[:args].split(/,\s*/).map do |arg| - arg = arg.split(/\s*=\s*/, 2).first - arg.split(/[ \*]/).last - end - - # Check for obsolete - if m[:name] == 'Begin' && - (argnames == %w{name p_open size_on_first_use bg_alpha_override flags} || - argnames == %w{items_count items_height}) - next - end - - $stderr.puts m.inspect if $-d - - fail "Return value #{m[:type]} is not bool or void" unless %w{bool void}.include?(m[:type]) - - if !current_class || current_class.name != m[:name] - if current_class - current_class.close - puts - end - - current_class = WrapperClass.new(m) - end - - attrs = m[:attrs].gsub(/IM_FMT(ARGS|LIST)\(\d+\)/) do |a| - a.sub(/\d+/) { |index| (index.to_i + 1).to_s } - end - - print "#{INDENT}#{current_class.class_name}(#{m[:args]})#{attrs} { " - - use_varargs = false - if argnames.last == '...' - argnames[-1] = 'ap' - use_varargs = true - print "va_list ap; va_start(ap, fmt); " - end - - print "#{current_class.state_var} = " if current_class.state_var - - print "ImGui::#{m[:name]}" - print 'V' if use_varargs - print "(#{argnames.join(', ')}); " - print 'va_end(ap); ' if use_varargs - - puts '}' - end -end - -current_class.close if current_class - diff --git a/misc/raii/imgui_raii.h b/misc/raii/imgui_raii.h deleted file mode 100644 index 55cdb672d..000000000 --- a/misc/raii/imgui_raii.h +++ /dev/null @@ -1,74 +0,0 @@ -#include "imgui.h" - -#pragma once - -class ImWindow -{ -public: - bool IsExpanded; - - ImWindow(const char* name, bool* p_open = NULL, ImGuiWindowFlags flags = 0) { IsExpanded = ImGui::Begin(name, p_open, flags); } - ~ImWindow() { ImGui::End(); } - - operator bool() { return IsExpanded; } -}; - -class ImPushID -{ -public: - ImPushID(const char* str_id) { ImGui::PushID(str_id); } - ImPushID(const char* str_id_begin, const char* str_id_end) { ImGui::PushID(str_id_begin, str_id_end); } - ImPushID(const void* ptr_id) { ImGui::PushID(ptr_id); } - ImPushID(int int_id) { ImGui::PushID(int_id); } - ~ImPushID() { ImGui::PopID(); } -}; - -class ImTreeNode -{ -public: - bool IsOpen; - - ImTreeNode(const char* label) { IsOpen = ImGui::TreeNode(label); } - ImTreeNode(const char* str_id, const char* fmt, ...) IM_FMTARGS(3) { va_list ap; va_start(ap, fmt); IsOpen = ImGui::TreeNodeV(str_id, fmt, ap); va_end(ap); } - ImTreeNode(const void* ptr_id, const char* fmt, ...) IM_FMTARGS(3) { va_list ap; va_start(ap, fmt); IsOpen = ImGui::TreeNodeV(ptr_id, fmt, ap); va_end(ap); } - ~ImTreeNode() { if (IsOpen) ImGui::TreePop(); } - - operator bool() { return IsOpen; } -}; - -class ImTreeNodeV -{ -public: - bool IsOpen; - - ImTreeNodeV(const char* str_id, const char* fmt, va_list args) IM_FMTLIST(3) { IsOpen = ImGui::TreeNodeV(str_id, fmt, args); } - ImTreeNodeV(const void* ptr_id, const char* fmt, va_list args) IM_FMTLIST(3) { IsOpen = ImGui::TreeNodeV(ptr_id, fmt, args); } - ~ImTreeNodeV() { if (IsOpen) ImGui::TreePop(); } - - operator bool() { return IsOpen; } -}; - -class ImTreeNodeEx -{ -public: - bool IsOpen; - - ImTreeNodeEx(const char* label, ImGuiTreeNodeFlags flags = 0) { IsOpen = ImGui::TreeNodeEx(label, flags); } - ImTreeNodeEx(const char* str_id, ImGuiTreeNodeFlags flags, const char* fmt, ...) IM_FMTARGS(4) { va_list ap; va_start(ap, fmt); IsOpen = ImGui::TreeNodeExV(str_id, flags, fmt, ap); va_end(ap); } - ImTreeNodeEx(const void* ptr_id, ImGuiTreeNodeFlags flags, const char* fmt, ...) IM_FMTARGS(4) { va_list ap; va_start(ap, fmt); IsOpen = ImGui::TreeNodeExV(ptr_id, flags, fmt, ap); va_end(ap); } - ~ImTreeNodeEx() { if (IsOpen) ImGui::TreePop(); } - - operator bool() { return IsOpen; } -}; - -class ImTreeNodeExV -{ -public: - bool IsOpen; - - ImTreeNodeExV(const char* str_id, ImGuiTreeNodeFlags flags, const char* fmt, va_list args) IM_FMTLIST(4) { IsOpen = ImGui::TreeNodeExV(str_id, flags, fmt, args); } - ImTreeNodeExV(const void* ptr_id, ImGuiTreeNodeFlags flags, const char* fmt, va_list args) IM_FMTLIST(4) { IsOpen = ImGui::TreeNodeExV(ptr_id, flags, fmt, args); } - ~ImTreeNodeExV() { if (IsOpen) ImGui::TreePop(); } - - operator bool() { return IsOpen; } -};