ColorConvertHSVtoRGB and ColorConvertRGBtoHSV to manuals

This commit is contained in:
sonoro1234
2018-10-04 11:22:00 +02:00
parent 3d232c5369
commit 4a0e927c23
11 changed files with 58 additions and 31 deletions

View File

@@ -1253,14 +1253,6 @@ CIMGUI_API ImU32 igColorConvertFloat4ToU32(const ImVec4 in)
{ {
return ImGui::ColorConvertFloat4ToU32(in); return ImGui::ColorConvertFloat4ToU32(in);
} }
CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float out_h,float out_s,float out_v)
{
return ImGui::ColorConvertRGBtoHSV(r,g,b,out_h,out_s,out_v);
}
CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float out_r,float out_g,float out_b)
{
return ImGui::ColorConvertHSVtoRGB(h,s,v,out_r,out_g,out_b);
}
CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key) CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key)
{ {
return ImGui::GetKeyIndex(imgui_key); return ImGui::GetKeyIndex(imgui_key);
@@ -2234,3 +2226,11 @@ CIMGUI_API float igGET_FLT_MAX()
{ {
return FLT_MAX; return FLT_MAX;
} }
CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v)
{
ImGui::ColorConvertRGBtoHSV(r,g,b,*out_h,*out_s,*out_v);
}
CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b)
{
ImGui::ColorConvertHSVtoRGB(h,s,v,*out_r,*out_g,*out_b);
}

View File

@@ -1139,8 +1139,6 @@ CIMGUI_API bool igBeginChildFrame(ImGuiID id,const ImVec2 size,ImGuiWindowFlags
CIMGUI_API void igEndChildFrame(void); CIMGUI_API void igEndChildFrame(void);
CIMGUI_API ImVec4 igColorConvertU32ToFloat4(ImU32 in); CIMGUI_API ImVec4 igColorConvertU32ToFloat4(ImU32 in);
CIMGUI_API ImU32 igColorConvertFloat4ToU32(const ImVec4 in); CIMGUI_API ImU32 igColorConvertFloat4ToU32(const ImVec4 in);
CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float out_h,float out_s,float out_v);
CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float out_r,float out_g,float out_b);
CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key); CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key);
CIMGUI_API bool igIsKeyDown(int user_key_index); CIMGUI_API bool igIsKeyDown(int user_key_index);
CIMGUI_API bool igIsKeyPressed(int user_key_index,bool repeat); CIMGUI_API bool igIsKeyPressed(int user_key_index,bool repeat);
@@ -1376,5 +1374,9 @@ CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const ch
CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig *config); CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig *config);
//for getting FLT_MAX in bindings //for getting FLT_MAX in bindings
CIMGUI_API float igGET_FLT_MAX(); CIMGUI_API float igGET_FLT_MAX();
//not const args from & to *
CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v);
CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b);

View File

@@ -33,3 +33,11 @@ CIMGUI_API float igGET_FLT_MAX()
{ {
return FLT_MAX; return FLT_MAX;
} }
CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v)
{
ImGui::ColorConvertRGBtoHSV(r,g,b,*out_h,*out_s,*out_v);
}
CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b)
{
ImGui::ColorConvertHSVtoRGB(h,s,v,*out_r,*out_g,*out_b);
}

View File

@@ -78,5 +78,9 @@ CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const ch
CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig *config); CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig *config);
//for getting FLT_MAX in bindings //for getting FLT_MAX in bindings
CIMGUI_API float igGET_FLT_MAX(); CIMGUI_API float igGET_FLT_MAX();
//not const args from & to *
CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v);
CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b);

View File

@@ -1253,14 +1253,6 @@ CIMGUI_API ImU32 igColorConvertFloat4ToU32(const ImVec4 in)
{ {
return ImGui::ColorConvertFloat4ToU32(in); return ImGui::ColorConvertFloat4ToU32(in);
} }
CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float out_h,float out_s,float out_v)
{
return ImGui::ColorConvertRGBtoHSV(r,g,b,out_h,out_s,out_v);
}
CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float out_r,float out_g,float out_b)
{
return ImGui::ColorConvertHSVtoRGB(h,s,v,out_r,out_g,out_b);
}
CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key) CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key)
{ {
return ImGui::GetKeyIndex(imgui_key); return ImGui::GetKeyIndex(imgui_key);
@@ -2014,3 +2006,11 @@ CIMGUI_API float igGET_FLT_MAX()
{ {
return FLT_MAX; return FLT_MAX;
} }
CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v)
{
ImGui::ColorConvertRGBtoHSV(r,g,b,*out_h,*out_s,*out_v);
}
CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b)
{
ImGui::ColorConvertHSVtoRGB(h,s,v,*out_r,*out_g,*out_b);
}

View File

@@ -1437,8 +1437,6 @@ CIMGUI_API bool igBeginChildFrame(ImGuiID id,const ImVec2 size,ImGuiWindowFlags
CIMGUI_API void igEndChildFrame(void); // always call EndChildFrame() regardless of BeginChildFrame() return values (which indicates a collapsed/clipped window) CIMGUI_API void igEndChildFrame(void); // always call EndChildFrame() regardless of BeginChildFrame() return values (which indicates a collapsed/clipped window)
CIMGUI_API ImVec4 igColorConvertU32ToFloat4(ImU32 in); CIMGUI_API ImVec4 igColorConvertU32ToFloat4(ImU32 in);
CIMGUI_API ImU32 igColorConvertFloat4ToU32(const ImVec4 in); CIMGUI_API ImU32 igColorConvertFloat4ToU32(const ImVec4 in);
CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float out_h,float out_s,float out_v);
CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float out_r,float out_g,float out_b);
// Inputs // Inputs
CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key); // map ImGuiKey_* values into user's key index. == io.KeyMap[key] CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key); // map ImGuiKey_* values into user's key index. == io.KeyMap[key]
CIMGUI_API bool igIsKeyDown(int user_key_index); // is key being held. == io.KeysDown[user_key_index]. note that imgui doesn't know the semantic of each entry of io.KeysDown[]. Use your own indices/enums according to how your backend/engine stored them into io.KeysDown[]! CIMGUI_API bool igIsKeyDown(int user_key_index); // is key being held. == io.KeysDown[user_key_index]. note that imgui doesn't know the semantic of each entry of io.KeysDown[]. Use your own indices/enums according to how your backend/engine stored them into io.KeysDown[]!
@@ -1723,5 +1721,9 @@ CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const ch
CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig *config); CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig *config);
//for getting FLT_MAX in bindings //for getting FLT_MAX in bindings
CIMGUI_API float igGET_FLT_MAX(); CIMGUI_API float igGET_FLT_MAX();
//not const args from & to *
CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v);
CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b);

View File

@@ -1253,14 +1253,6 @@ CIMGUI_API ImU32 igColorConvertFloat4ToU32(const ImVec4 in)
{ {
return ImGui::ColorConvertFloat4ToU32(in); return ImGui::ColorConvertFloat4ToU32(in);
} }
CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float out_h,float out_s,float out_v)
{
return ImGui::ColorConvertRGBtoHSV(r,g,b,out_h,out_s,out_v);
}
CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float out_r,float out_g,float out_b)
{
return ImGui::ColorConvertHSVtoRGB(h,s,v,out_r,out_g,out_b);
}
CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key) CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key)
{ {
return ImGui::GetKeyIndex(imgui_key); return ImGui::GetKeyIndex(imgui_key);
@@ -2234,3 +2226,11 @@ CIMGUI_API float igGET_FLT_MAX()
{ {
return FLT_MAX; return FLT_MAX;
} }
CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v)
{
ImGui::ColorConvertRGBtoHSV(r,g,b,*out_h,*out_s,*out_v);
}
CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b)
{
ImGui::ColorConvertHSVtoRGB(h,s,v,*out_r,*out_g,*out_b);
}

View File

@@ -1139,8 +1139,6 @@ CIMGUI_API bool igBeginChildFrame(ImGuiID id,const ImVec2 size,ImGuiWindowFlags
CIMGUI_API void igEndChildFrame(void); CIMGUI_API void igEndChildFrame(void);
CIMGUI_API ImVec4 igColorConvertU32ToFloat4(ImU32 in); CIMGUI_API ImVec4 igColorConvertU32ToFloat4(ImU32 in);
CIMGUI_API ImU32 igColorConvertFloat4ToU32(const ImVec4 in); CIMGUI_API ImU32 igColorConvertFloat4ToU32(const ImVec4 in);
CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float out_h,float out_s,float out_v);
CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float out_r,float out_g,float out_b);
CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key); CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key);
CIMGUI_API bool igIsKeyDown(int user_key_index); CIMGUI_API bool igIsKeyDown(int user_key_index);
CIMGUI_API bool igIsKeyPressed(int user_key_index,bool repeat); CIMGUI_API bool igIsKeyPressed(int user_key_index,bool repeat);
@@ -1376,5 +1374,9 @@ CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const ch
CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig *config); CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig *config);
//for getting FLT_MAX in bindings //for getting FLT_MAX in bindings
CIMGUI_API float igGET_FLT_MAX(); CIMGUI_API float igGET_FLT_MAX();
//not const args from & to *
CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v);
CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b);

File diff suppressed because one or more lines are too long

View File

@@ -2132,6 +2132,7 @@ defs["igColorConvertRGBtoHSV"][1]["funcname"] = "ColorConvertRGBtoHSV"
defs["igColorConvertRGBtoHSV"][1]["args"] = "(float r,float g,float b,float out_h,float out_s,float out_v)" defs["igColorConvertRGBtoHSV"][1]["args"] = "(float r,float g,float b,float out_h,float out_s,float out_v)"
defs["igColorConvertRGBtoHSV"][1]["ret"] = "void" defs["igColorConvertRGBtoHSV"][1]["ret"] = "void"
defs["igColorConvertRGBtoHSV"][1]["comment"] = "" defs["igColorConvertRGBtoHSV"][1]["comment"] = ""
defs["igColorConvertRGBtoHSV"][1]["manual"] = true
defs["igColorConvertRGBtoHSV"][1]["call_args"] = "(r,g,b,out_h,out_s,out_v)" defs["igColorConvertRGBtoHSV"][1]["call_args"] = "(r,g,b,out_h,out_s,out_v)"
defs["igColorConvertRGBtoHSV"][1]["argsoriginal"] = "(float r,float g,float b,float& out_h,float& out_s,float& out_v)" defs["igColorConvertRGBtoHSV"][1]["argsoriginal"] = "(float r,float g,float b,float& out_h,float& out_s,float& out_v)"
defs["igColorConvertRGBtoHSV"][1]["stname"] = "ImGui" defs["igColorConvertRGBtoHSV"][1]["stname"] = "ImGui"
@@ -4333,6 +4334,7 @@ defs["igLogText"][1]["funcname"] = "LogText"
defs["igLogText"][1]["args"] = "(const char* fmt,...)" defs["igLogText"][1]["args"] = "(const char* fmt,...)"
defs["igLogText"][1]["ret"] = "void" defs["igLogText"][1]["ret"] = "void"
defs["igLogText"][1]["comment"] = "" defs["igLogText"][1]["comment"] = ""
defs["igLogText"][1]["manual"] = true
defs["igLogText"][1]["call_args"] = "(fmt,...)" defs["igLogText"][1]["call_args"] = "(fmt,...)"
defs["igLogText"][1]["argsoriginal"] = "(const char* fmt,...)" defs["igLogText"][1]["argsoriginal"] = "(const char* fmt,...)"
defs["igLogText"][1]["stname"] = "ImGui" defs["igLogText"][1]["stname"] = "ImGui"
@@ -7670,6 +7672,7 @@ defs["ImGuiTextBuffer_appendf"][1]["funcname"] = "appendf"
defs["ImGuiTextBuffer_appendf"][1]["args"] = "(const char* fmt,...)" defs["ImGuiTextBuffer_appendf"][1]["args"] = "(const char* fmt,...)"
defs["ImGuiTextBuffer_appendf"][1]["ret"] = "void" defs["ImGuiTextBuffer_appendf"][1]["ret"] = "void"
defs["ImGuiTextBuffer_appendf"][1]["comment"] = "" defs["ImGuiTextBuffer_appendf"][1]["comment"] = ""
defs["ImGuiTextBuffer_appendf"][1]["manual"] = true
defs["ImGuiTextBuffer_appendf"][1]["call_args"] = "(fmt,...)" defs["ImGuiTextBuffer_appendf"][1]["call_args"] = "(fmt,...)"
defs["ImGuiTextBuffer_appendf"][1]["argsoriginal"] = "(const char* fmt,...)" defs["ImGuiTextBuffer_appendf"][1]["argsoriginal"] = "(const char* fmt,...)"
defs["ImGuiTextBuffer_appendf"][1]["stname"] = "ImGuiTextBuffer" defs["ImGuiTextBuffer_appendf"][1]["stname"] = "ImGuiTextBuffer"
@@ -9004,6 +9007,7 @@ defs["igColorConvertHSVtoRGB"][1]["funcname"] = "ColorConvertHSVtoRGB"
defs["igColorConvertHSVtoRGB"][1]["args"] = "(float h,float s,float v,float out_r,float out_g,float out_b)" defs["igColorConvertHSVtoRGB"][1]["args"] = "(float h,float s,float v,float out_r,float out_g,float out_b)"
defs["igColorConvertHSVtoRGB"][1]["ret"] = "void" defs["igColorConvertHSVtoRGB"][1]["ret"] = "void"
defs["igColorConvertHSVtoRGB"][1]["comment"] = "" defs["igColorConvertHSVtoRGB"][1]["comment"] = ""
defs["igColorConvertHSVtoRGB"][1]["manual"] = true
defs["igColorConvertHSVtoRGB"][1]["call_args"] = "(h,s,v,out_r,out_g,out_b)" defs["igColorConvertHSVtoRGB"][1]["call_args"] = "(h,s,v,out_r,out_g,out_b)"
defs["igColorConvertHSVtoRGB"][1]["argsoriginal"] = "(float h,float s,float v,float& out_r,float& out_g,float& out_b)" defs["igColorConvertHSVtoRGB"][1]["argsoriginal"] = "(float h,float s,float v,float& out_r,float& out_g,float& out_b)"
defs["igColorConvertHSVtoRGB"][1]["stname"] = "ImGui" defs["igColorConvertHSVtoRGB"][1]["stname"] = "ImGui"

View File

@@ -32,6 +32,8 @@ for i=1,#script_args do table.insert(implementations,script_args[i]) end
local cimgui_manuals = { local cimgui_manuals = {
igLogText = true, igLogText = true,
ImGuiTextBuffer_appendf = true, ImGuiTextBuffer_appendf = true,
igColorConvertRGBtoHSV = true,
igColorConvertHSVtoRGB = true
} }
-------------------------------------------------------------------------- --------------------------------------------------------------------------
--this table is a dictionary to force a naming of function overloading (instead of algorythmic generated) --this table is a dictionary to force a naming of function overloading (instead of algorythmic generated)
@@ -552,6 +554,9 @@ local function func_parser()
defT.location = locat defT.location = locat
defT.comment = comment defT.comment = comment
defT.argsT = argsArr defT.argsT = argsArr
if get_manuals(defT) then
defT.manual = true
end
if ret then if ret then
defT.ret = clean_spaces(ret:gsub("&","*")) defT.ret = clean_spaces(ret:gsub("&","*"))
defT.retref = ret:match("&") defT.retref = ret:match("&")