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.

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

Add osgAtlasSimbicon and osgTinkertoy examples #781

Merged
merged 39 commits into from
Oct 7, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
659feb0
moved osg examples to the examples folder and created a blank example…
mxgrey Sep 23, 2016
3a67ef4
Add ImGui
jslee02 Sep 25, 2016
3dec2a5
Add OSG + ImGui viewer with a basic example
jslee02 Sep 25, 2016
b2e39b4
Remove unnecessary ImGui releated files from gui.hpp
jslee02 Sep 25, 2016
a5d23d8
Add initial osgAtlasSimbicon.cpp -- almost empty
jslee02 Sep 26, 2016
c27a45e
creating Tinkertoy demo for OSS Challenge
mxgrey Sep 26, 2016
f4e55c3
Checking for BodyNodeDnD when disabling a generic DnD
mxgrey Sep 27, 2016
651e1c7
Finished tinkertoy demo -- need to add instructions
mxgrey Sep 27, 2016
3f269ea
Made instructional text less confusing
mxgrey Sep 27, 2016
3b431b9
Finished osgTinkertoy demo, and wrote instructions
mxgrey Sep 27, 2016
3cfaf1d
small adjustments to osgTinkertoy
mxgrey Sep 27, 2016
9c50231
Setting the window name for the Tinkertoy demo
mxgrey Sep 27, 2016
cb3b44a
Add osgAtlasSimbicon
jslee02 Sep 28, 2016
838ad2c
Make osgAtlasSimbicon less verbose
jslee02 Sep 28, 2016
f76cefa
Add interactions to AtlasSimbicon
jslee02 Sep 28, 2016
5bee2c4
Merge remote-tracking branch 'origin/oss_challenge' into imgui
jslee02 Oct 3, 2016
59b00d6
added a second toy to the tinkertoy demo
mxgrey Oct 3, 2016
6d20615
Merge remote-tracking branch 'origin/oss_challenge' into imgui
jslee02 Oct 3, 2016
fca0156
Attempting to use ImGuiViewer for osg examples
jslee02 Oct 4, 2016
d525ee9
Add control widget for Tinkertoy2 (copy of Tinkertoy)
jslee02 Oct 4, 2016
143d71d
Adding widget to Atlas example
jslee02 Oct 5, 2016
2ab7e1a
Finish osg atlas example
jslee02 Oct 5, 2016
2d2d4c7
Move warning suppression macro from Deprecated.hpp to Warning.hpp int…
jslee02 Oct 5, 2016
fbe9a16
Suppress warnings from imgui_draw.cpp
jslee02 Oct 5, 2016
fe17b3b
Suppress warnings from imgui_draw.cpp in other way
jslee02 Oct 5, 2016
68b4d5a
Move warning suppression macro from Deprecated.hpp to Warning.hpp int…
jslee02 Oct 5, 2016
6d09c3a
added more to tinkertoy gui
mxgrey Oct 6, 2016
f7a398a
removed hardcoded path
mxgrey Oct 6, 2016
ce16083
ignoring all contents of the screencap folder
mxgrey Oct 6, 2016
41e1392
renamed osgTinkertoy2 to osgTinkertoy
mxgrey Oct 6, 2016
02b01dd
Fix title of atlas widget
jslee02 Oct 6, 2016
abd6c05
Merge remote-tracking branch 'origin/imgui' into oss_challenge
jslee02 Oct 6, 2016
b6bd9fe
Merge remote-tracking branch 'origin/master' into oss_challenge
jslee02 Oct 6, 2016
5646800
Update changelog
jslee02 Oct 6, 2016
439c411
Remove unnecessary ImGui demo file
jslee02 Oct 6, 2016
272160d
Fix Eigen memory alignment issue
jslee02 Oct 6, 2016
d85295a
Fix clang warning: unknown warning group '-Wreserved-id-macro'
jslee02 Oct 6, 2016
b4554ae
Remove redundant line in imgui_draw.cpp
jslee02 Oct 6, 2016
726b784
Add missing array header
jslee02 Oct 7, 2016
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ TAGS
/nbproject/
/doxygen/html/
docs/readthedocs/site
data/screencap/*
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@
* Added `sdf` parsing for `fixed` joint and `material` tag of visual shape: [#775](https://github.com/dartsim/dart/pull/775)
* Added support of urdfdom_headers 1.0: [#766](https://github.com/dartsim/dart/pull/766)

* GUI

* Added ImGui for 2D graphical interface: [#781](https://github.com/dartsim/dart/pull/781)

* Examples

* Added osgAtlasSimbicon and osgTinkertoy: [#781](https://github.com/dartsim/dart/pull/781)

* Misc improvements and bug fixes

* Added `virtual Shape::getType()` and deprecated `ShapeType Shape::getShapeType()`: [#724](https://github.com/dartsim/dart/pull/724)
Expand Down
5 changes: 5 additions & 0 deletions dart/gui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ target_link_libraries(dart-gui dart-utils ${GLUT_LIBRARY} ${OPENGL_LIBRARIES})

# Generate header for this namespace
dart_get_filename_components(header_names "gui headers" ${hdrs})
list(REMOVE_ITEM header_names stb_textedit.h)
list(REMOVE_ITEM header_names stb_truetype.h)
list(REMOVE_ITEM header_names stb_rect_pack.h)
list(REMOVE_ITEM header_names imconfig.h)
list(REMOVE_ITEM header_names imgui_internal.h)
if(HAVE_OPENSCENEGRAPH)
list(APPEND header_names "osg/osg.hpp")
endif(HAVE_OPENSCENEGRAPH)
Expand Down
51 changes: 51 additions & 0 deletions dart/gui/imconfig.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
//-----------------------------------------------------------------------------
// USER IMPLEMENTATION
// This file contains compile-time options for ImGui.
// Other options (memory allocation overrides, callbacks, etc.) can be set at runtime via the ImGuiIO structure - ImGui::GetIO().
//-----------------------------------------------------------------------------

#pragma once

//---- Define assertion handler. Defaults to calling assert().
//#define IM_ASSERT(_EXPR) MyAssert(_EXPR)

//---- Define attributes of all API symbols declarations, e.g. for DLL under Windows.
//#define IMGUI_API __declspec( dllexport )
//#define IMGUI_API __declspec( dllimport )

//---- Include imgui_user.h at the end of imgui.h
//#define IMGUI_INCLUDE_IMGUI_USER_H

//---- Don't implement default handlers for Windows (so as not to link with OpenClipboard() and others Win32 functions)
//#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCS
//#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCS

//---- Don't implement help and test window functionality (ShowUserGuide()/ShowStyleEditor()/ShowTestWindow() methods will be empty)
//#define IMGUI_DISABLE_TEST_WINDOWS

//---- Don't define obsolete functions names
//#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS

//---- Implement STB libraries in a namespace to avoid conflicts
//#define IMGUI_STB_NAMESPACE ImGuiStb

//---- Define constructor and implicit cast operators to convert back<>forth from your math types and ImVec2/ImVec4.
/*
#define IM_VEC2_CLASS_EXTRA \
ImVec2(const MyVec2& f) { x = f.x; y = f.y; } \
operator MyVec2() const { return MyVec2(x,y); }

#define IM_VEC4_CLASS_EXTRA \
ImVec4(const MyVec4& f) { x = f.x; y = f.y; z = f.z; w = f.w; } \
operator MyVec4() const { return MyVec4(x,y,z,w); }
*/

//---- Tip: You can add extra functions within the ImGui:: namespace, here or in your own headers files.
//---- e.g. create variants of the ImGui::Value() helper for your low-level math types, or your own widgets/helpers.
/*
namespace ImGui
{
void Value(const char* prefix, const MyMatrix44& v, const char* float_format = NULL);
}
*/

9,724 changes: 9,724 additions & 0 deletions dart/gui/imgui.cpp

Large diffs are not rendered by default.

1,402 changes: 1,402 additions & 0 deletions dart/gui/imgui.h

Large diffs are not rendered by default.

Loading