Commit 1c27c80b authored by Ricardo Ortiz's avatar Ricardo Ortiz
Browse files

ENH: Create a SceneModels module to house the scene objects

classes. Also create a SimulationManager in charge of
running the simulation.
parent 9b0ff671
Pipeline #4824 passed with stage
......@@ -286,6 +286,8 @@ set(SimMedTK_exports
TimeIntegrators
VTKRendering
VirtualTools
SceneModels
SimulationManager
)
if(SimMedTK_USE_OCULUS)
......@@ -304,7 +306,9 @@ add_subdirectory(IO)
add_subdirectory(Mesh)
add_subdirectory(Rendering)
add_subdirectory(Simulators)
add_subdirectory(SimulationManager)
add_subdirectory(Solvers)
add_subdirectory(SceneModels)
add_subdirectory(TimeIntegrators)
add_subdirectory(VTKRendering)
add_subdirectory(VirtualTools)
......
......@@ -31,7 +31,6 @@
#include "Collision/OctreeCell.h"
#include "Collision/CollisionMoller.h"
#include "Collision/MeshCollisionModel.h"
#include "Core/SDK.h"
#include "Mesh/SurfaceMesh.h"
......
......@@ -16,6 +16,7 @@ target_link_libraries(${Module}UnitTestRunner
Mesh
ContactHandling
Solvers
SceneModels
)
simple_test(${Module} --reporter=spec)
......@@ -29,7 +29,7 @@
#include "Collision/PlaneCollisionModel.h"
#include "Core/CollisionPair.h"
#include "Simulators/VegaFemSceneObject.h"
#include "Core/StaticSceneObject.h"
#include "SceneModels/StaticSceneObject.h"
using namespace bandit;
......
......@@ -16,13 +16,8 @@ simmedtk_add_library(Core
Light.cpp
Model.cpp
Module.cpp
ObjectSimulator.cpp
RenderDetail.cpp
Scene.cpp
SceneObject.cpp
SDK.cpp
Simulator.cpp
StaticSceneObject.cpp
Timer.cpp
UnifiedId.cpp
ViewerBase.cpp
......@@ -56,17 +51,10 @@ simmedtk_add_library(Core
MemoryBlock.h
Model.h
Module.h
ObjectSimulator.h
Quaternion.h
RenderDelegate.h
RenderDetail.h
Scene.h
SceneObject.h
Scheduler.h
SDK.h
Simulator.h
StaticSceneObject.h
Synchronization.h
Texture.h
Timer.h
UnifiedId.h
......
......@@ -26,7 +26,7 @@
// SimMedTK includes
#include "Core/CoreClass.h"
#include "Core/SceneObject.h"
#include "SceneModels/SceneObject.h"
// STL includes
#include <memory>
......
......@@ -26,7 +26,6 @@
#include "Core/Config.h"
#include "Core/CoreClass.h"
#include "Core/SDK.h"
#include <iostream>
#include <string>
......
......@@ -34,7 +34,7 @@
#include "Core/CoreClass.h"
#include "Core/ErrorLog.h"
#include "Core/Light.h"
#include "Core/SceneObject.h"
#include "SceneModels/SceneObject.h"
#include "Core/DataStructures.h"
#include "Event/KeyboardEvent.h"
#include "Event/MouseButtonEvent.h"
......
......@@ -22,7 +22,6 @@
//---------------------------------------------------------------------------
#include "Core/Config.h"
#include "Core/SDK.h"
#include "Core/ViewerBase.h"
#include "Core/DataStructures.h"
#include "Core/RenderDelegate.h"
......@@ -244,8 +243,6 @@ void ViewerBase::render()
void ViewerBase::addObject(std::shared_ptr<CoreClass> object)
{
SDK::getInstance()->addRef(object);
objectList.push_back(object);
}
......
......@@ -29,7 +29,6 @@
#include "Core/Scene.h"
#include "Core/Dispatcher.h"
#include "Core/Module.h"
#include "Core/StaticSceneObject.h"
#include "Core/DataStructures.h"
// Forward declaration
......
......@@ -29,7 +29,7 @@
#include "Core/Config.h"
#include "Core/CoreClass.h"
#include "Core/ErrorLog.h"
#include "Core/SDK.h"
#include "SimulationManager/SDK.h"
#include "Event/AudioEvent.h"
/// \brief class to enable audio rendering
......
......@@ -15,6 +15,8 @@ target_link_libraries(${APP}
Event
IO
Solvers
SceneModels
SimulationManager
)
set_target_properties(${APP}
......
......@@ -24,11 +24,11 @@
#include <memory>
// Core SimMedTK includes
#include "Core/SDK.h"
#include "SimulationManager/SDK.h"
// Include required types scene objects
#include "Simulators/VegaFemSceneObject.h"
#include "Core/StaticSceneObject.h"
#include "SceneModels/StaticSceneObject.h"
#include "Mesh/VegaVolumetricMesh.h"
// Include required simulators
......
......@@ -14,6 +14,8 @@ target_link_libraries(${APP}
Devices
VirtualTools
Solvers
SceneModels
SimulationManager
)
set_target_properties(${APP}
......
......@@ -24,11 +24,11 @@
#include <memory>
// Core SimMedTK includes
#include "Core/SDK.h"
#include "SimulationManager/SDK.h"
// Include required types scene objects
#include "Simulators/VegaFemSceneObject.h"
#include "Core/StaticSceneObject.h"
#include "SceneModels/StaticSceneObject.h"
#include "Mesh/VegaVolumetricMesh.h"
#include "Devices/VRPNForceDevice.h"
// #include "Devices/VRPNDeviceServer.h"
......
......@@ -13,6 +13,8 @@ target_link_libraries(${APP}
Devices
VirtualTools
Solvers
SceneModels
SimulationManager
)
set_target_properties(${APP}
......
......@@ -9,8 +9,8 @@
#include <cmath>
// Core iMSTK includes
#include "Core/SDK.h"
#include "Core/StaticSceneObject.h"
#include "SimulationManager/SDK.h"
#include "SceneModels/StaticSceneObject.h"
#include "Devices/VRPNForceDevice.h"
#include "Devices/VRPNDeviceServer.h"
#include "VirtualTools/ToolCoupler.h"
......
......@@ -12,6 +12,8 @@ target_link_libraries(${APP}
Event
IO
Solvers
SceneModels
SimulationManager
)
set_target_properties(${APP}
......
......@@ -24,8 +24,9 @@
#include <memory>
// Core SimMedTK includes
#include "Core/SDK.h"
#include "SimulationManager/SDK.h"
#include "Geometry/MeshModel.h"
#include "SceneModels/StaticSceneObject.h"
#include "IO/InitIO.h"
#include "VTKRendering/InitVTKRendering.h"
......
......@@ -29,7 +29,7 @@
#include "Core/ConfigRendering.h"
#include "Core/Config.h"
#include "Core/CoreClass.h"
#include "Core/SceneObject.h"
#include "SceneModels/SceneObject.h"
//forward declaration
class SceneObject;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment