mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-05 19:19:39 -06:00
fixup after rebase
This commit is contained in:
@@ -95,7 +95,6 @@ inline interaction::InteractionMonitor* interactionMonitor;
|
||||
inline interaction::JoystickInputStates* joystickInputStates;
|
||||
inline interaction::WebsocketInputStates* websocketInputStates;
|
||||
inline interaction::KeybindingManager* keybindingManager;
|
||||
inline interaction::KeyframeRecording* keyframeRecording;
|
||||
inline interaction::NavigationHandler* navigationHandler;
|
||||
inline interaction::SessionRecording* sessionRecording;
|
||||
inline interaction::KeyframeRecording* keyframeRecording;
|
||||
|
||||
@@ -627,14 +627,6 @@ void RenderableModel::initialize() {
|
||||
|
||||
for (const std::unique_ptr<LightSource>& ls : _lightSources) {
|
||||
ls->initialize();
|
||||
|
||||
if (_castShadow) {
|
||||
SceneGraphLightSource* ptr = dynamic_cast<SceneGraphLightSource*>(ls.get());
|
||||
if (ptr != nullptr) {
|
||||
const auto parent = this->parent();
|
||||
ptr->registerShadowCaster(parent->identifier());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (_lightSource.size() > 0) {
|
||||
|
||||
@@ -1020,8 +1020,8 @@ void RenderableGlobe::update(const UpdateData& data) {
|
||||
const events::Event* e = global::eventEngine->firstEvent();
|
||||
while (e) {
|
||||
switch (e->type) {
|
||||
case events::Event::Type::SceneGraphNodeAdded:
|
||||
case events::Event::Type::SceneGraphNodeRemoved:
|
||||
case events::Event::Type::PropertyTreeUpdated:
|
||||
case events::Event::Type::PropertyTreePruned:
|
||||
case events::Event::Type::RenderableDisabled:
|
||||
case events::Event::Type::RenderableEnabled:
|
||||
case events::Event::Type::Custom:
|
||||
|
||||
Reference in New Issue
Block a user