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

Add osgAtlasSimbicon and osgTinkertoy examples #781

Merged
merged 39 commits into from
Oct 7, 2016
Merged

Add osgAtlasSimbicon and osgTinkertoy examples #781

merged 39 commits into from
Oct 7, 2016

Conversation

jslee02
Copy link
Member

@jslee02 jslee02 commented Oct 6, 2016 •
edited
Loading

YouTube videos for osgAtlasSimbicon and osgTinkertoy.

Subordinate changes:

  • Move OpenSceneGraph based examples to the examples folder
  • Use ImGui for 2D graphical interface
  • Add two template examples: osgEmpty and osgImGui

Also, we have a good news. Brand new DART website is now open!

This change is Reviewable

mxgrey and others added 30 commits September 23, 2016 14:16
@mxgrey
moved osg examples to the examples folder and created a blank example…
659feb0 
… for osg
@jslee02
Add ImGui
3a67ef4
@jslee02
Add OSG + ImGui viewer with a basic example
3dec2a5
@jslee02
Remove unnecessary ImGui releated files from gui.hpp
b2e39b4
@jslee02
Add initial osgAtlasSimbicon.cpp -- almost empty
a5d23d8
@mxgrey
creating Tinkertoy demo for OSS Challenge
c27a45e
@mxgrey
Checking for BodyNodeDnD when disabling a generic DnD
f4e55c3
@mxgrey
Finished tinkertoy demo -- need to add instructions
651e1c7
@mxgrey
Made instructional text less confusing
3f269ea
@mxgrey
Finished osgTinkertoy demo, and wrote instructions
3b431b9
@mxgrey
small adjustments to osgTinkertoy
3cfaf1d
@mxgrey
Setting the window name for the Tinkertoy demo
9c50231
@jslee02
Add osgAtlasSimbicon
cb3b44a
@jslee02
Make osgAtlasSimbicon less verbose
838ad2c
@jslee02
Add interactions to AtlasSimbicon
f76cefa
@jslee02
Merge remote-tracking branch 'origin/oss_challenge' into imgui
5bee2c4
@mxgrey
added a second toy to the tinkertoy demo
59b00d6
@jslee02
Merge remote-tracking branch 'origin/oss_challenge' into imgui
6d20615
@jslee02
Attempting to use ImGuiViewer for osg examples
fca0156
@jslee02
Add control widget for Tinkertoy2 (copy of Tinkertoy)
d525ee9
@jslee02
Adding widget to Atlas example
143d71d
@jslee02
Finish osg atlas example
2ab7e1a
@jslee02
Move warning suppression macro from Deprecated.hpp to Warning.hpp int…
2d2d4c7 
…roducing other macros
@jslee02
Suppress warnings from imgui_draw.cpp
fbe9a16
@jslee02
Suppress warnings from imgui_draw.cpp in other way
fe17b3b
@jslee02
Move warning suppression macro from Deprecated.hpp to Warning.hpp int…
68b4d5a 
…roducing other macros (reverted from commit 2d2d4c7)
@mxgrey
added more to tinkertoy gui
6d09c3a
@mxgrey
removed hardcoded path
f7a398a
@mxgrey
ignoring all contents of the screencap folder
ce16083
@mxgrey
renamed osgTinkertoy2 to osgTinkertoy
41e1392
@jslee02 jslee02 added this to the DART 6.1.0 milestone Oct 6, 2016
@jslee02 jslee02 merged commit fc7644a into master Oct 7, 2016
@jslee02 jslee02 deleted the oss_challenge branch October 7, 2016 22:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
DART 6.1.0
Development

Successfully merging this pull request may close these issues.
2 participants
@jslee02 @mxgrey