Skip to content

Changed Plugins to build against new Screen Directory Hierarchy #9

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
johnmangan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Changed Plugins to build against new Screen Directory Hierarchy #9

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
e5a74e7
* Changed include references to hit new Screen locations.
johnmangan Jul 15, 2013
36ef9da
* Updated ModelLoader so that the loadFile callback will simply load …
johnmangan Aug 26, 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
2 changes: 1 addition & 1 deletion calit2/GML/GML.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

// CVR
#include <cvrKernel/CVRPlugin.h>
#include <cvrKernel/ScreenBase.h>
#include <cvrKernel/Screens/ScreenBase.h>
#include <cvrKernel/SceneManager.h>
#include <cvrKernel/Navigation.h>
#include <cvrKernel/PluginHelper.h>
Expand Down
2 changes: 1 addition & 1 deletion calit2/ImageViewer/ImageObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "ImageObject.h"

#include <cvrKernel/NodeMask.h>
#include <cvrKernel/ScreenBase.h>
#include <cvrKernel/Screens/ScreenBase.h>

#include <osgDB/ReadFile>

Expand Down
4 changes: 2 additions & 2 deletions calit2/MVSim/MVSim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#define _MVSIM_H_

#include <cvrKernel/CVRPlugin.h>
#include <cvrKernel/ScreenMVMaster.h>
#include <cvrKernel/ScreenMVSimulator.h>
#include <cvrKernel/Screens/ScreenMVMaster.h>
#include <cvrKernel/Screens/ScreenMVSimulator.h>
#include <cvrMenu/MenuButton.h>
#include <cvrMenu/SubMenu.h>
#include <cvrMenu/MenuCheckbox.h>
Expand Down
28 changes: 5 additions & 23 deletions calit2/ModelLoader/ModelLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ using namespace cvr;

CVRPLUGIN(ModelLoader)

ModelLoader::ModelLoader() : FileLoadCallback("iv,wrl,vrml,obj,osg,earth")
ModelLoader::ModelLoader() : FileLoadCallback("iv,wrl,vrml,obj,osg,earth,3ds")
{
}

Expand Down Expand Up @@ -622,15 +622,15 @@ void ModelLoader::message(int type, char * &data, bool collaborative)
}
}

bool ModelLoader::loadFile(std::string file)
SceneObject* ModelLoader::loadFile(std::string file)
{
std::cerr << "ModelLoader: Loading file: " << file << std::endl;

osg::Node* modelNode = osgDB::readNodeFile(file);
if(modelNode==NULL)
{
cerr << "ModelLoader: Error reading file " << file << endl;
return false;
return NULL;
}
else
{
Expand Down Expand Up @@ -661,30 +661,12 @@ bool ModelLoader::loadFile(std::string file)
modelNode->accept(tr2v);

SceneObject * so = new SceneObject(name,false,false,false,true,false);
PluginHelper::registerSceneObject(so,"ModelLoader");
osg::Switch * sNode = new osg::Switch();
sNode->addChild(modelNode);
so->addChild(sNode);
so->attachToScene();
so->addChild(modelNode);
so->setNavigationOn(true);
so->addMoveMenuItem();
so->addNavigationMenuItem();

MenuButton * mb;

mb = new MenuButton("Reset Position");
mb->setCallback(this);
so->addMenuItem(mb);
_resetMap[so] = mb;

mb = new MenuButton("Delete");
mb->setCallback(this);
so->addMenuItem(mb);
_deleteMap[so] = mb;

_loadedObjects.push_back(so);

return true;
return so;
}

void ModelLoader::writeConfigFile()
Expand Down
2 changes: 1 addition & 1 deletion calit2/ModelLoader/ModelLoader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class ModelLoader : public cvr::MenuCallback, public cvr::CVRPlugin, public cvr:
void preFrame();

virtual void message(int type, char * &data, bool collaborative=false);
virtual bool loadFile(std::string file);
virtual cvr::SceneObject* loadFile(std::string file);

protected:
cvr::SubMenu * MLMenu, * loadMenu;
Expand Down
2 changes: 1 addition & 1 deletion calit2/MultiViewSimulator/MultiViewSimulator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <cvrConfig/ConfigManager.h>
#include <cvrKernel/InteractionManager.h>
#include <cvrKernel/PluginHelper.h>
#include <cvrKernel/ScreenMultiViewer2.h>
#include <cvrKernel/Screens/Screens/ScreenMultiViewer2.h>
#include <cvrMenu/MenuSystem.h>

#include <osg/ShapeDrawable>
Expand Down
2 changes: 1 addition & 1 deletion calit2/OssimPlanet/OssimPlanet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
#include <cvrKernel/PluginHelper.h>

#include <cvrKernel/CVRPlugin.h>
#include <cvrKernel/ScreenBase.h>
#include <cvrKernel/Screens/Screens/ScreenBase.h>
#include <cvrKernel/SceneManager.h>
#include <cvrKernel/Navigation.h>
#include <cvrKernel/ComController.h>
Expand Down
2 changes: 1 addition & 1 deletion calit2/PanoView360/PanoDrawable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <cvrConfig/ConfigManager.h>
#include <cvrKernel/ScreenConfig.h>
#include <cvrKernel/ScreenBase.h>
#include <cvrKernel/Screens/ScreenBase.h>
#include <cvrKernel/ComController.h>
#include <cvrKernel/NodeMask.h>

Expand Down
2 changes: 1 addition & 1 deletion calit2/PanoViewLOD/PanoDrawableLOD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <cvrKernel/NodeMask.h>
#include <cvrKernel/ScreenConfig.h>
#include <cvrKernel/PluginHelper.h>
#include <cvrKernel/ScreenBase.h>
#include <cvrKernel/Screens/ScreenBase.h>

#include <osg/GraphicsContext>

Expand Down
2 changes: 1 addition & 1 deletion calit2/Points/Points.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

// CVR
#include <cvrKernel/CVRPlugin.h>
#include <cvrKernel/ScreenBase.h>
#include <cvrKernel/Screens/ScreenBase.h>
#include <cvrKernel/SceneManager.h>
#include <cvrKernel/SceneObject.h>
#include <cvrKernel/Navigation.h>
Expand Down
2 changes: 1 addition & 1 deletion calit2/SMV2Settings/SMV2Settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <cvrKernel/InteractionManager.h>
#include <cvrKernel/PluginHelper.h>
#include <cvrKernel/ScreenConfig.h>
#include <cvrKernel/ScreenMVZones.h>
#include <cvrKernel/Screens/ScreenMVZones.h>
#include <cvrMenu/MenuSystem.h>

#include <osg/ShapeDrawable>
Expand Down
2 changes: 1 addition & 1 deletion calit2/SMV2Settings/SMV2Settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define SMV2SETTINGS

#include <cvrKernel/CVRPlugin.h>
#include <cvrKernel/ScreenMVSimulator.h>
#include <cvrKernel/Screens/ScreenMVSimulator.h>
#include <cvrMenu/MenuButton.h>
#include <cvrMenu/SubMenu.h>
#include <cvrMenu/MenuCheckbox.h>
Expand Down
2 changes: 1 addition & 1 deletion calit2/Site/Site.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <cvrConfig/ConfigManager.h>
#include <cvrKernel/CVRPlugin.h>
#include <cvrKernel/PluginHelper.h>
#include <cvrKernel/ScreenBase.h>
#include <cvrKernel/Screens/ScreenBase.h>
#include <cvrKernel/SceneManager.h>
#include <cvrKernel/Navigation.h>
#include <cvrKernel/ComController.h>
Expand Down
2 changes: 1 addition & 1 deletion calit2/Site/Site.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <cvrKernel/CVRPlugin.h>
#include <cvrKernel/FileHandler.h>
#include <cvrKernel/ScreenBase.h>
#include <cvrKernel/Screens/ScreenBase.h>
#include <cvrKernel/SceneManager.h>
#include <cvrKernel/Navigation.h>
#include <cvrKernel/ComController.h>
Expand Down
2 changes: 1 addition & 1 deletion general/MenuBasics/MenuBasics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <cvrKernel/CVRViewer.h>
#include <cvrKernel/ScreenConfig.h>
#include <cvrKernel/ComController.h>
#include <cvrKernel/ScreenBase.h>
#include <cvrKernel/Screens/ScreenBase.h>
#include <cvrInput/TrackingManager.h>
#include <cvrMenu/MenuSystem.h>
#include <cvrConfig/ConfigManager.h>
Expand Down