Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

argument names and enum tag #8

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

argument names and enum tag #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4721ea
argument names and enum tag
sonoro1234 Sep 4, 2020
4cd1587
dddd
sonoro1234 Sep 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions example/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,19 @@ else()
else()
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}")
if(WIN32)
find_package(glfw3 REQUIRED)
find_package(glfw3 REQUIRED PATHS "C:/LuaGL/gitsources/BUILDS/GLFW/install")
#include_directories(glfw)#${GLFW_INCLUDE})#${GLFW3_INCLUDE_PATH})
target_include_directories(${PROJECT_NAME} PUBLIC glfw)
message(STATUS includes ${GLFW_INCLUDE})
message(STATUS found ${glfw3_FOUND})
#link_directories(${SRC}/libs/glfw/buildWin/lib/${CMAKE_BUILD_TYPE})
#set(TARGET_LIBS ${CMAKE_DL_LIBS} "${SRC}/libs/glfw/buildWin/lib/${CMAKE_BUILD_TYPE}/glfw3.lib")
#set(TARGET_LIBS ${CMAKE_DL_LIBS} "-lglfw3.lib")
else()
#find_package(glfw3 REQUIRED)
set(TARGET_LIBS ${CMAKE_DL_LIBS} "-lglfw3 -lpthread -lX11")
endif(WIN32)
target_link_libraries(${PROJECT_NAME} ${OPENGL_gl_LIBRARY} ${GLFW3_LIBRARY})
target_link_libraries(${PROJECT_NAME} ${OPENGL_gl_LIBRARY} glfw)#${GLFW3_LIBRARY})
endif()

endif ()
32 changes: 16 additions & 16 deletions example/src/tools/imGuIZMOquat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ struct imguiGizmo
vgButtons buttonPanDolly = vg::evLeftButton;
#endif

enum { //0b0000'0000, //C++14 notation
enum igqMODE{ //0b0000'0000, //C++14 notation
mode3Axes = 0x0001, //0b0000'0001,
modeDirection = 0x0002, //0b0000'0010,
modeDirPlane = 0x0004, //0b0000'0100,
Expand All @@ -91,11 +91,11 @@ struct imguiGizmo
axesModeMask = 0xff00
};

enum { sphereTess16, sphereTess8, sphereTess4, sphereTess2 };
enum { CONE_SURF, CONE_CAP, CYL_SURF, CYL_CAP };
enum igqTESS{ sphereTess16, sphereTess8, sphereTess4, sphereTess2 };
enum igqSHAPE{ CONE_SURF, CONE_CAP, CYL_SURF, CYL_CAP };
//enum { SOLID_SURF, SOLID_CAP }
//enum {
enum { axisIsX, axisIsY, axisIsZ };
enum igqAXIS{ axisIsX, axisIsY, axisIsZ };

enum solidSides{ backSide, frontSide }; // or viceversa...
static ImVector<vec3> sphereVtx;
Expand Down Expand Up @@ -314,24 +314,24 @@ struct imguiGizmo
namespace ImGui
{

IMGUI_API bool gizmo3D(const char*, quat&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::mode3Axes|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char*, vec4&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::mode3Axes|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char*, vec3&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::modeDirection);
IMGUI_API bool gizmo3D(const char* label, quat& a, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::mode3Axes|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, vec4& a, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::mode3Axes|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, vec3& a, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::modeDirection);

IMGUI_API bool gizmo3D(const char*, quat&, quat&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char*, quat&, vec4&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char*, quat&, vec3&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, quat& a, quat& b, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, quat& a, vec4& b, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, quat& a, vec3& b, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);

#ifndef IMGUIZMO_USE_ONLY_ROT

//with Pan & Dolly feature
IMGUI_API bool gizmo3D(const char*, vec3&, quat&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::mode3Axes|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char*, vec3&, vec4&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::mode3Axes|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char*, vec3&, vec3&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::modeDirection);
IMGUI_API bool gizmo3D(const char* label, vec3& a, quat& b, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::mode3Axes|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, vec3& a, vec4& b, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::mode3Axes|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, vec3& a, vec3& b, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::modeDirection);

IMGUI_API bool gizmo3D(const char*, vec3&, quat&, quat&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char*, vec3&, quat&, vec4&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char*, vec3&, quat&, vec3&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, vec3& a, quat& b, quat& c, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, vec3& a, quat& b, vec4& c, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, vec3& a, quat& b, vec3& c, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);

#endif
}
Expand Down
32 changes: 16 additions & 16 deletions imGuIZMO.quat/imGuIZMOquat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ struct imguiGizmo
vgButtons buttonPanDolly = vg::evLeftButton;
#endif

enum { //0b0000'0000, //C++14 notation
enum igqMODE{ //0b0000'0000, //C++14 notation
mode3Axes = 0x0001, //0b0000'0001,
modeDirection = 0x0002, //0b0000'0010,
modeDirPlane = 0x0004, //0b0000'0100,
Expand All @@ -91,11 +91,11 @@ struct imguiGizmo
axesModeMask = 0xff00
};

enum { sphereTess16, sphereTess8, sphereTess4, sphereTess2 };
enum { CONE_SURF, CONE_CAP, CYL_SURF, CYL_CAP };
enum igqTESS{ sphereTess16, sphereTess8, sphereTess4, sphereTess2 };
enum igqSHAPE{ CONE_SURF, CONE_CAP, CYL_SURF, CYL_CAP };
//enum { SOLID_SURF, SOLID_CAP }
//enum {
enum { axisIsX, axisIsY, axisIsZ };
enum igqAXIS{ axisIsX, axisIsY, axisIsZ };

enum solidSides{ backSide, frontSide }; // or viceversa...
static ImVector<vec3> sphereVtx;
Expand Down Expand Up @@ -314,24 +314,24 @@ struct imguiGizmo
namespace ImGui
{

IMGUI_API bool gizmo3D(const char*, quat&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::mode3Axes|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char*, vec4&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::mode3Axes|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char*, vec3&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::modeDirection);
IMGUI_API bool gizmo3D(const char* label, quat& a, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::mode3Axes|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, vec4& a, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::mode3Axes|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, vec3& a, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::modeDirection);

IMGUI_API bool gizmo3D(const char*, quat&, quat&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char*, quat&, vec4&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char*, quat&, vec3&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, quat& a, quat& b, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, quat& a, vec4& b, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, quat& a, vec3& b, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);

#ifndef IMGUIZMO_USE_ONLY_ROT

//with Pan & Dolly feature
IMGUI_API bool gizmo3D(const char*, vec3&, quat&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::mode3Axes|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char*, vec3&, vec4&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::mode3Axes|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char*, vec3&, vec3&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::modeDirection);
IMGUI_API bool gizmo3D(const char* label, vec3& a, quat& b, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::mode3Axes|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, vec3& a, vec4& b, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::mode3Axes|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, vec3& a, vec3& b, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::modeDirection);

IMGUI_API bool gizmo3D(const char*, vec3&, quat&, quat&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char*, vec3&, quat&, vec4&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char*, vec3&, quat&, vec3&, float=IMGUIZMO_DEF_SIZE, const int=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, vec3& a, quat& b, quat& c, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, vec3& a, quat& b, vec4& c, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);
IMGUI_API bool gizmo3D(const char* label, vec3& a, quat& b, vec3& c, float size=IMGUIZMO_DEF_SIZE, const int mode=imguiGizmo::modeDual|imguiGizmo::cubeAtOrigin);

#endif
}
Expand Down