Skip to content

Update Base und UI Contrib to current OpenSG 2 API #23

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

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

Update Base und UI Contrib to current OpenSG 2 API #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2bd43cc
Update Base and UI to current OSG 2 API
Mar 11, 2013
67f26c3
Rename animation classes and files to avoid name clashes
Mar 11, 2013
4837d92
Update Base and UI to current OSG 2 API
Mar 11, 2013
0936f82
Prevent from regenerating code from fcds
Mar 11, 2013
55b23a8
Use current rapidXML files
Mar 14, 2013
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
18 changes: 9 additions & 9 deletions Examples/Tutorial/UserInterface/01Button.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,13 @@ int main(int argc, char **argv)
TutorialWindow->initWindow();

// Create the SimpleSceneManager helper
SimpleSceneManager sceneManager;
TutorialWindow->setDisplayCallback(boost::bind(display, &sceneManager));
TutorialWindow->setReshapeCallback(boost::bind(reshape, _1, &sceneManager));
SimpleSceneManagerRefPtr sceneManager = SimpleSceneManager::create();
TutorialWindow->setDisplayCallback(boost::bind(display, sceneManager));
TutorialWindow->setReshapeCallback(boost::bind(reshape, _1, sceneManager));
TutorialWindow->connectKeyTyped(boost::bind(keyTyped, _1));

// Tell the Manager what to manage
sceneManager.setWindow(TutorialWindow);
sceneManager->setWindow(TutorialWindow);


// Make Torus Node (creates Torus in background of scene)
Expand Down Expand Up @@ -324,18 +324,18 @@ int main(int argc, char **argv)

TutorialUIForeground->setDrawingSurface(TutorialDrawingSurface);

sceneManager.setRoot(scene);
sceneManager->setRoot(scene);

// Add the UI Foreground Object to the Scene
ViewportRefPtr TutorialViewport = sceneManager.getWindow()->getPort(0);
ViewportRefPtr TutorialViewport = sceneManager->getWindow()->getPort(0);
TutorialViewport->addForeground(TutorialUIForeground);


//Create the Documentation Foreground and add it to the viewport
SimpleScreenDoc TheSimpleScreenDoc(&sceneManager, TutorialWindow);
SimpleScreenDoc TheSimpleScreenDoc(sceneManager, TutorialWindow);

// Show the whole Scene
sceneManager.showAll();
sceneManager->showAll();

//Attach key controls

Expand Down Expand Up @@ -432,7 +432,7 @@ SimpleScreenDoc::SimpleScreenDoc(SimpleSceneManager* SceneManager,
//Animation
_ShowDocFadeOutAnimation = FieldAnimation::create();
_ShowDocFadeOutAnimation->setAnimator(TheAnimator);
_ShowDocFadeOutAnimation->setInterpolationType(Animator::LINEAR_INTERPOLATION);
_ShowDocFadeOutAnimation->setInterpolationType(TBAnimator::LINEAR_INTERPOLATION);
_ShowDocFadeOutAnimation->setCycling(1);
_ShowDocFadeOutAnimation->setAnimatedField(_DocShowForeground,
SimpleTextForeground::ColorFieldId);
Expand Down
18 changes: 9 additions & 9 deletions Examples/Tutorial/UserInterface/02AbsoluteLayout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,12 @@ int main(int argc, char **argv)
TutorialWindow->initWindow();

// Create the SimpleSceneManager helper
SimpleSceneManager sceneManager;
TutorialWindow->setDisplayCallback(boost::bind(display, &sceneManager));
TutorialWindow->setReshapeCallback(boost::bind(reshape, _1, &sceneManager));
SimpleSceneManagerRefPtr sceneManager = SimpleSceneManager::create();
TutorialWindow->setDisplayCallback(boost::bind(display, sceneManager));
TutorialWindow->setReshapeCallback(boost::bind(reshape, _1, sceneManager));

// Tell the Manager what to manage
sceneManager.setWindow(TutorialWindow);
sceneManager->setWindow(TutorialWindow);

TutorialWindow->connectKeyTyped(boost::bind(keyPressed, _1));

Expand Down Expand Up @@ -285,17 +285,17 @@ int main(int argc, char **argv)
TutorialUIForeground->setDrawingSurface(TutorialDrawingSurface);

// Tell the Manager what to manage
sceneManager.setRoot(scene);
sceneManager->setRoot(scene);

// Add the UI Foreground Object to the Scene
ViewportRecPtr TutorialViewport = sceneManager.getWindow()->getPort(0);
ViewportRecPtr TutorialViewport = sceneManager->getWindow()->getPort(0);
TutorialViewport->addForeground(TutorialUIForeground);

//Create the Documentation Foreground and add it to the viewport
SimpleScreenDoc TheSimpleScreenDoc(&sceneManager, TutorialWindow);
SimpleScreenDoc TheSimpleScreenDoc(sceneManager, TutorialWindow);

// Show the whole Scene
sceneManager.showAll();
sceneManager->showAll();

//Open Window
Vec2f WinSize(TutorialWindow->getDesktopSize() * 0.85f);
Expand Down Expand Up @@ -386,7 +386,7 @@ SimpleScreenDoc::SimpleScreenDoc(SimpleSceneManager* SceneManager,
//Animation
_ShowDocFadeOutAnimation = FieldAnimation::create();
_ShowDocFadeOutAnimation->setAnimator(TheAnimator);
_ShowDocFadeOutAnimation->setInterpolationType(Animator::LINEAR_INTERPOLATION);
_ShowDocFadeOutAnimation->setInterpolationType(TBAnimator::LINEAR_INTERPOLATION);
_ShowDocFadeOutAnimation->setCycling(1);
_ShowDocFadeOutAnimation->setAnimatedField(_DocShowForeground,
SimpleTextForeground::ColorFieldId);
Expand Down
18 changes: 9 additions & 9 deletions Examples/Tutorial/UserInterface/03Border.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,12 @@ int main(int argc, char **argv)
TutorialWindow->initWindow();

// Create the SimpleSceneManager helper
SimpleSceneManager sceneManager;
TutorialWindow->setDisplayCallback(boost::bind(display, &sceneManager));
TutorialWindow->setReshapeCallback(boost::bind(reshape, _1, &sceneManager));
SimpleSceneManagerRefPtr sceneManager = SimpleSceneManager::create();
TutorialWindow->setDisplayCallback(boost::bind(display, sceneManager));
TutorialWindow->setReshapeCallback(boost::bind(reshape, _1, sceneManager));

// Tell the Manager what to manage
sceneManager.setWindow(TutorialWindow);
sceneManager->setWindow(TutorialWindow);

TutorialWindow->connectKeyTyped(boost::bind(keyPressed, _1));

Expand Down Expand Up @@ -535,17 +535,17 @@ CompoundBorders, etc.
TutorialUIForeground->setDrawingSurface(TutorialDrawingSurface);

// Tell the Manager what to manage
sceneManager.setRoot(scene);
sceneManager->setRoot(scene);

// Add the UI Foreground Object to the Scene
ViewportRecPtr TutorialViewport = sceneManager.getWindow()->getPort(0);
ViewportRecPtr TutorialViewport = sceneManager->getWindow()->getPort(0);
TutorialViewport->addForeground(TutorialUIForeground);

//Create the Documentation Foreground and add it to the viewport
SimpleScreenDoc TheSimpleScreenDoc(&sceneManager, TutorialWindow);
SimpleScreenDoc TheSimpleScreenDoc(sceneManager, TutorialWindow);

// Show the whole Scene
sceneManager.showAll();
sceneManager->showAll();


//Open Window
Expand Down Expand Up @@ -629,7 +629,7 @@ SimpleScreenDoc::SimpleScreenDoc(SimpleSceneManager* SceneManager,
//Animation
_ShowDocFadeOutAnimation = FieldAnimation::create();
_ShowDocFadeOutAnimation->setAnimator(TheAnimator);
_ShowDocFadeOutAnimation->setInterpolationType(Animator::LINEAR_INTERPOLATION);
_ShowDocFadeOutAnimation->setInterpolationType(TBAnimator::LINEAR_INTERPOLATION);
_ShowDocFadeOutAnimation->setCycling(1);
_ShowDocFadeOutAnimation->setAnimatedField(_DocShowForeground,
SimpleTextForeground::ColorFieldId);
Expand Down
18 changes: 9 additions & 9 deletions Examples/Tutorial/UserInterface/04Background.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,12 @@ int main(int argc, char **argv)
TutorialWindow->initWindow();

// Create the SimpleSceneManager helper
SimpleSceneManager sceneManager;
TutorialWindow->setDisplayCallback(boost::bind(display, &sceneManager));
TutorialWindow->setReshapeCallback(boost::bind(reshape, _1, &sceneManager));
SimpleSceneManagerRefPtr sceneManager = SimpleSceneManager::create();
TutorialWindow->setDisplayCallback(boost::bind(display, sceneManager));
TutorialWindow->setReshapeCallback(boost::bind(reshape, _1, sceneManager));

// Tell the Manager what to manage
sceneManager.setWindow(TutorialWindow);
sceneManager->setWindow(TutorialWindow);

TutorialWindow->connectKeyTyped(boost::bind(keyTyped, _1));

Expand Down Expand Up @@ -504,17 +504,17 @@ int main(int argc, char **argv)


// Create the SimpleSceneManager helper
sceneManager.setRoot(scene);
sceneManager->setRoot(scene);

// Add the UI Foreground Object to the Scene
ViewportRefPtr TutorialViewport = sceneManager.getWindow()->getPort(0);
ViewportRefPtr TutorialViewport = sceneManager->getWindow()->getPort(0);
TutorialViewport->addForeground(TutorialUIForeground);

//Create the Documentation Foreground and add it to the viewport
SimpleScreenDoc TheSimpleScreenDoc(&sceneManager, TutorialWindow);
SimpleScreenDoc TheSimpleScreenDoc(sceneManager, TutorialWindow);

// Show the whole Scene
sceneManager.showAll();
sceneManager->showAll();

//Open Window
Vec2f WinSize(TutorialWindow->getDesktopSize() * 0.85f);
Expand Down Expand Up @@ -597,7 +597,7 @@ SimpleScreenDoc::SimpleScreenDoc(SimpleSceneManager* SceneManager,
//Animation
_ShowDocFadeOutAnimation = FieldAnimation::create();
_ShowDocFadeOutAnimation->setAnimator(TheAnimator);
_ShowDocFadeOutAnimation->setInterpolationType(Animator::LINEAR_INTERPOLATION);
_ShowDocFadeOutAnimation->setInterpolationType(TBAnimator::LINEAR_INTERPOLATION);
_ShowDocFadeOutAnimation->setCycling(1);
_ShowDocFadeOutAnimation->setAnimatedField(_DocShowForeground,
SimpleTextForeground::ColorFieldId);
Expand Down
18 changes: 9 additions & 9 deletions Examples/Tutorial/UserInterface/05FlowLayout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,12 @@ int main(int argc, char **argv)
TutorialWindow->initWindow();

// Create the SimpleSceneManager helper
SimpleSceneManager sceneManager;
TutorialWindow->setDisplayCallback(boost::bind(display, &sceneManager));
TutorialWindow->setReshapeCallback(boost::bind(reshape, _1, &sceneManager));
SimpleSceneManagerRefPtr sceneManager = SimpleSceneManager::create();
TutorialWindow->setDisplayCallback(boost::bind(display, sceneManager));
TutorialWindow->setReshapeCallback(boost::bind(reshape, _1, sceneManager));

// Tell the Manager what to manage
sceneManager.setWindow(TutorialWindow);
sceneManager->setWindow(TutorialWindow);

TutorialWindow->connectKeyTyped(boost::bind(keyPressed, _1));

Expand Down Expand Up @@ -267,17 +267,17 @@ int main(int argc, char **argv)
TutorialUIForeground->setDrawingSurface(TutorialDrawingSurface);

// Tell the Manager what to manage
sceneManager.setRoot(scene);
sceneManager->setRoot(scene);

// Add the UI Foreground Object to the Scene
ViewportRecPtr TutorialViewport = sceneManager.getWindow()->getPort(0);
ViewportRecPtr TutorialViewport = sceneManager->getWindow()->getPort(0);
TutorialViewport->addForeground(TutorialUIForeground);

//Create the Documentation Foreground and add it to the viewport
SimpleScreenDoc TheSimpleScreenDoc(&sceneManager, TutorialWindow);
SimpleScreenDoc TheSimpleScreenDoc(sceneManager, TutorialWindow);

// Show the whole Scene
sceneManager.showAll();
sceneManager->showAll();

//Open Window
Vec2f WinSize(TutorialWindow->getDesktopSize() * 0.85f);
Expand Down Expand Up @@ -359,7 +359,7 @@ SimpleScreenDoc::SimpleScreenDoc(SimpleSceneManager* SceneManager,
//Animation
_ShowDocFadeOutAnimation = FieldAnimation::create();
_ShowDocFadeOutAnimation->setAnimator(TheAnimator);
_ShowDocFadeOutAnimation->setInterpolationType(Animator::LINEAR_INTERPOLATION);
_ShowDocFadeOutAnimation->setInterpolationType(TBAnimator::LINEAR_INTERPOLATION);
_ShowDocFadeOutAnimation->setCycling(1);
_ShowDocFadeOutAnimation->setAnimatedField(_DocShowForeground,
SimpleTextForeground::ColorFieldId);
Expand Down
18 changes: 9 additions & 9 deletions Examples/Tutorial/UserInterface/06BoxLayout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,12 @@ int main(int argc, char **argv)
TutorialWindow->initWindow();

// Create the SimpleSceneManager helper
SimpleSceneManager sceneManager;
TutorialWindow->setDisplayCallback(boost::bind(display, &sceneManager));
TutorialWindow->setReshapeCallback(boost::bind(reshape, _1, &sceneManager));
SimpleSceneManagerRefPtr sceneManager = SimpleSceneManager::create();
TutorialWindow->setDisplayCallback(boost::bind(display, sceneManager));
TutorialWindow->setReshapeCallback(boost::bind(reshape, _1, sceneManager));

// Tell the Manager what to manage
sceneManager.setWindow(TutorialWindow);
sceneManager->setWindow(TutorialWindow);

TutorialWindow->connectKeyTyped(boost::bind(keyPressed, _1));

Expand Down Expand Up @@ -273,17 +273,17 @@ int main(int argc, char **argv)
TutorialUIForeground->setDrawingSurface(TutorialDrawingSurface);

// Tell the Manager what to manage
sceneManager.setRoot(scene);
sceneManager->setRoot(scene);

// Add the UI Foreground Object to the Scene
ViewportRecPtr TutorialViewport = sceneManager.getWindow()->getPort(0);
ViewportRecPtr TutorialViewport = sceneManager->getWindow()->getPort(0);
TutorialViewport->addForeground(TutorialUIForeground);

//Create the Documentation Foreground and add it to the viewport
SimpleScreenDoc TheSimpleScreenDoc(&sceneManager, TutorialWindow);
SimpleScreenDoc TheSimpleScreenDoc(sceneManager, TutorialWindow);

// Show the whole Scene
sceneManager.showAll();
sceneManager->showAll();

//Open Window
Vec2f WinSize(TutorialWindow->getDesktopSize() * 0.85f);
Expand Down Expand Up @@ -365,7 +365,7 @@ SimpleScreenDoc::SimpleScreenDoc(SimpleSceneManager* SceneManager,
//Animation
_ShowDocFadeOutAnimation = FieldAnimation::create();
_ShowDocFadeOutAnimation->setAnimator(TheAnimator);
_ShowDocFadeOutAnimation->setInterpolationType(Animator::LINEAR_INTERPOLATION);
_ShowDocFadeOutAnimation->setInterpolationType(TBAnimator::LINEAR_INTERPOLATION);
_ShowDocFadeOutAnimation->setCycling(1);
_ShowDocFadeOutAnimation->setAnimatedField(_DocShowForeground,
SimpleTextForeground::ColorFieldId);
Expand Down
18 changes: 9 additions & 9 deletions Examples/Tutorial/UserInterface/07GridLayout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ int main(int argc, char **argv)
TutorialWindow->initWindow();

// Create the SimpleSceneManager helper
SimpleSceneManager sceneManager;
TutorialWindow->setDisplayCallback(boost::bind(display, &sceneManager));
TutorialWindow->setReshapeCallback(boost::bind(reshape, _1, &sceneManager));
SimpleSceneManagerRefPtr sceneManager = SimpleSceneManager::create();
TutorialWindow->setDisplayCallback(boost::bind(display, sceneManager));
TutorialWindow->setReshapeCallback(boost::bind(reshape, _1, sceneManager));

// Tell the Manager what to manage
sceneManager.setWindow(TutorialWindow);
sceneManager->setWindow(TutorialWindow);

TutorialWindow->connectKeyTyped(boost::bind(keyPressed, _1));

Expand Down Expand Up @@ -269,17 +269,17 @@ int main(int argc, char **argv)


// Tell the Manager what to manage
sceneManager.setRoot(scene);
sceneManager->setRoot(scene);

// Add the UI Foreground Object to the Scene
ViewportRecPtr TutorialViewport = sceneManager.getWindow()->getPort(0);
ViewportRecPtr TutorialViewport = sceneManager->getWindow()->getPort(0);
TutorialViewport->addForeground(TutorialUIForeground);

//Create the Documentation Foreground and add it to the viewport
SimpleScreenDoc TheSimpleScreenDoc(&sceneManager, TutorialWindow);
SimpleScreenDoc TheSimpleScreenDoc(sceneManager, TutorialWindow);

// Show the whole Scene
sceneManager.showAll();
sceneManager->showAll();

//Open Window
Vec2f WinSize(TutorialWindow->getDesktopSize() * 0.85f);
Expand Down Expand Up @@ -361,7 +361,7 @@ SimpleScreenDoc::SimpleScreenDoc(SimpleSceneManager* SceneManager,
//Animation
_ShowDocFadeOutAnimation = FieldAnimation::create();
_ShowDocFadeOutAnimation->setAnimator(TheAnimator);
_ShowDocFadeOutAnimation->setInterpolationType(Animator::LINEAR_INTERPOLATION);
_ShowDocFadeOutAnimation->setInterpolationType(TBAnimator::LINEAR_INTERPOLATION);
_ShowDocFadeOutAnimation->setCycling(1);
_ShowDocFadeOutAnimation->setAnimatedField(_DocShowForeground,
SimpleTextForeground::ColorFieldId);
Expand Down
18 changes: 9 additions & 9 deletions Examples/Tutorial/UserInterface/08OverlayLayout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,12 @@ int main(int argc, char **argv)
TutorialWindow->initWindow();

// Create the SimpleSceneManager helper
SimpleSceneManager sceneManager;
TutorialWindow->setDisplayCallback(boost::bind(display, &sceneManager));
TutorialWindow->setReshapeCallback(boost::bind(reshape, _1, &sceneManager));
SimpleSceneManagerRefPtr sceneManager = SimpleSceneManager::create();
TutorialWindow->setDisplayCallback(boost::bind(display, sceneManager));
TutorialWindow->setReshapeCallback(boost::bind(reshape, _1, sceneManager));

// Tell the Manager what to manage
sceneManager.setWindow(TutorialWindow);
sceneManager->setWindow(TutorialWindow);

TutorialWindow->connectKeyTyped(boost::bind(keyPressed, _1));

Expand Down Expand Up @@ -218,17 +218,17 @@ can be set.


// Tell the Manager what to manage
sceneManager.setRoot(scene);
sceneManager->setRoot(scene);

// Add the UI Foreground Object to the Scene
ViewportRecPtr TutorialViewport = sceneManager.getWindow()->getPort(0);
ViewportRecPtr TutorialViewport = sceneManager->getWindow()->getPort(0);
TutorialViewport->addForeground(TutorialUIForeground);

//Create the Documentation Foreground and add it to the viewport
SimpleScreenDoc TheSimpleScreenDoc(&sceneManager, TutorialWindow);
SimpleScreenDoc TheSimpleScreenDoc(sceneManager, TutorialWindow);

// Show the whole Scene
sceneManager.showAll();
sceneManager->showAll();


//Open Window
Expand Down Expand Up @@ -311,7 +311,7 @@ SimpleScreenDoc::SimpleScreenDoc(SimpleSceneManager* SceneManager,
//Animation
_ShowDocFadeOutAnimation = FieldAnimation::create();
_ShowDocFadeOutAnimation->setAnimator(TheAnimator);
_ShowDocFadeOutAnimation->setInterpolationType(Animator::LINEAR_INTERPOLATION);
_ShowDocFadeOutAnimation->setInterpolationType(TBAnimator::LINEAR_INTERPOLATION);
_ShowDocFadeOutAnimation->setCycling(1);
_ShowDocFadeOutAnimation->setAnimatedField(_DocShowForeground,
SimpleTextForeground::ColorFieldId);
Expand Down
Loading