Skip to content

Commit

Permalink
Traktor: Removed IFeedbackListener from world and spark layers.
Browse files Browse the repository at this point in the history
  • Loading branch information
@apistol78
apistol78 committed Apr 19, 2024
1 parent b05ca7e commit c552ade
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 158 deletions.
45 changes: 0 additions & 45 deletions code/Runtime/Engine/SplitWorldLayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,29 +67,13 @@ SplitWorldLayer::SplitWorldLayer(
// Get initial field of view.
m_fieldOfView = m_environment->getSettings()->getProperty< float >(L"World.FieldOfView", 70.0f);

// Register ourself for camera shake.
//spray::IFeedbackManager* feedbackManager = m_environment->getWorld()->getFeedbackManager();
//if (feedbackManager)
//{
// feedbackManager->addListener(spray::FbtCamera, this);
// feedbackManager->addListener(spray::FbtImageProcess, this);
//}

// Set index in each view.
m_worldRenderViews[0].setIndex(0);
m_worldRenderViews[1].setIndex(1);
}

void SplitWorldLayer::destroy()
{
// Remove ourself from feedback manager.
//spray::IFeedbackManager* feedbackManager = m_environment->getWorld()->getFeedbackManager();
//if (feedbackManager)
//{
// feedbackManager->removeListener(spray::FbtImageProcess, this);
// feedbackManager->removeListener(spray::FbtCamera, this);
//}

m_environment = nullptr;
m_cameraEntities[0] = nullptr;
m_cameraEntities[1] = nullptr;
Expand Down Expand Up @@ -528,16 +512,6 @@ double SplitWorldLayer::getAlternateTime() const
return m_alternateTime;
}

void SplitWorldLayer::setFeedbackScale(float feedbackScale)
{
m_feedbackScale = feedbackScale;
}

float SplitWorldLayer::getFeedbackScale() const
{
return m_feedbackScale;
}

void SplitWorldLayer::setCamera(int32_t split, const world::Entity* cameraEntity)
{
m_cameraEntities[split] = cameraEntity;
Expand All @@ -548,23 +522,4 @@ const world::Entity* SplitWorldLayer::getCamera(int32_t split) const
return m_cameraEntities[split];
}

void SplitWorldLayer::feedbackValues(spray::FeedbackType type, const float* values, int32_t count)
{
if (type == spray::FbtCamera)
{
T_ASSERT(count >= 4);
// m_cameraOffset = Transform(
// Vector4(values[0], values[1], values[2]) * Scalar(m_feedbackScale),
// Quaternion::fromEulerAngles(0.0f, 0.0f, values[3] * m_feedbackScale)
// );
}
else if (type == spray::FbtImageProcess)
{
T_ASSERT(count >= 4);
// render::ImageProcess* postProcess = m_worldRenderer->getVisualImageProcess();
// if (postProcess)
// postProcess->setVectorParameter(s_handleFeedback, Vector4::loadUnaligned(values));
}
}

}
13 changes: 1 addition & 12 deletions code/Runtime/Engine/SplitWorldLayer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "Core/Math/IntervalTransform.h"
#include "Core/Math/Ray3.h"
#include "Resource/Proxy.h"
#include "Spray/Feedback/IFeedbackListener.h"
#include "World/WorldRenderView.h"

// import/export mechanism.
Expand Down Expand Up @@ -57,9 +56,7 @@ class IEnvironment;
/*! World stage layer.
* \ingroup Runtime
*/
class T_DLLCLASS SplitWorldLayer
: public Layer
, public spray::IFeedbackListener
class T_DLLCLASS SplitWorldLayer : public Layer
{
T_RTTI_CLASS;

Expand Down Expand Up @@ -131,17 +128,10 @@ class T_DLLCLASS SplitWorldLayer

double getAlternateTime() const;

void setFeedbackScale(float feedbackScale);

float getFeedbackScale() const;

void setCamera(int32_t split, const world::Entity* cameraEntity);

const world::Entity* getCamera(int32_t split) const;

protected:
virtual void feedbackValues(spray::FeedbackType type, const float* values, int32_t count) override final;

private:
IEnvironment* m_environment;
Ref< render::ScreenRenderer > m_screenRenderer;
Expand All @@ -155,7 +145,6 @@ class T_DLLCLASS SplitWorldLayer
double m_alternateTime = 0.0;
double m_deltaTime = 0.0;
float m_fieldOfView = 70.0f;
float m_feedbackScale = 1.0f;
bool m_controllerEnable = true;
SmallMap< Guid, Transform > m_entityTransforms;
};
Expand Down
47 changes: 0 additions & 47 deletions code/Runtime/Engine/WorldLayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,26 +59,10 @@ WorldLayer::WorldLayer(
{
// Get initial field of view.
m_fieldOfView = m_environment->getSettings()->getProperty< float >(L"World.FieldOfView", 70.0f);

// Register ourself for camera shake.
//spray::IFeedbackManager* feedbackManager = m_environment->getWorld()->getFeedbackManager();
//if (feedbackManager)
//{
// feedbackManager->addListener(spray::FbtCamera, this);
// feedbackManager->addListener(spray::FbtImageProcess, this);
//}
}

void WorldLayer::destroy()
{
// Remove ourself from feedback manager.
//spray::IFeedbackManager* feedbackManager = m_environment->getWorld()->getFeedbackManager();
//if (feedbackManager)
//{
// feedbackManager->removeListener(spray::FbtImageProcess, this);
// feedbackManager->removeListener(spray::FbtCamera, this);
//}

m_environment = nullptr;
m_cameraEntity = nullptr;

Expand Down Expand Up @@ -443,16 +427,6 @@ double WorldLayer::getAlternateTime() const
return m_alternateTime;
}

void WorldLayer::setFeedbackScale(float feedbackScale)
{
m_feedbackScale = feedbackScale;
}

float WorldLayer::getFeedbackScale() const
{
return m_feedbackScale;
}

void WorldLayer::setCamera(const world::Entity* cameraEntity)
{
m_cameraEntity = cameraEntity;
Expand All @@ -463,25 +437,4 @@ const world::Entity* WorldLayer::getCamera() const
return m_cameraEntity;
}

void WorldLayer::feedbackValues(spray::FeedbackType type, const float* values, int32_t count)
{
if (type == spray::FbtCamera)
{
T_ASSERT(count >= 4);
m_cameraOffset = Transform(
Vector4(values[0], values[1], values[2]) * Scalar(m_feedbackScale),
Quaternion::fromEulerAngles(0.0f, 0.0f, values[3] * m_feedbackScale)
);
}
else if (type == spray::FbtImageProcess)
{
T_ASSERT(count >= 4);

// \fixme
// render::ImageProcess* postProcess = m_worldRenderer->getVisualImageProcess();
// if (postProcess)
// postProcess->setVectorParameter(s_handleFeedback, Vector4::loadUnaligned(values));
}
}

}
13 changes: 1 addition & 12 deletions code/Runtime/Engine/WorldLayer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "Core/Math/IntervalTransform.h"
#include "Core/Math/Ray3.h"
#include "Resource/Proxy.h"
#include "Spray/Feedback/IFeedbackListener.h"
#include "World/WorldRenderView.h"

// import/export mechanism.
Expand Down Expand Up @@ -56,9 +55,7 @@ class IEnvironment;
/*! World stage layer.
* \ingroup Runtime
*/
class T_DLLCLASS WorldLayer
: public Layer
, public spray::IFeedbackListener
class T_DLLCLASS WorldLayer : public Layer
{
T_RTTI_CLASS;

Expand Down Expand Up @@ -131,17 +128,10 @@ class T_DLLCLASS WorldLayer

double getAlternateTime() const;

void setFeedbackScale(float feedbackScale);

float getFeedbackScale() const;

void setCamera(const world::Entity* cameraEntity);

const world::Entity* getCamera() const;

protected:
virtual void feedbackValues(spray::FeedbackType type, const float* values, int32_t count) override final;

private:
IEnvironment* m_environment;
resource::Proxy< scene::Scene > m_scene;
Expand All @@ -154,7 +144,6 @@ class T_DLLCLASS WorldLayer
double m_deltaTime = 0.0;
double m_controllerTime = -1.0;
float m_fieldOfView = 70.0f;
float m_feedbackScale = 1.0f;
bool m_controllerEnable = true;
SmallMap< Guid, Transform > m_entityTransforms;
};
Expand Down
2 changes: 0 additions & 2 deletions code/Runtime/GameClassFactory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,6 @@ void GameClassFactory::createClasses(IRuntimeClassRegistrar* registrar) const
// classSplitWorldLayer->addProperty< const Frustum& >("viewFrustum", &SplitWorldLayer::getViewFrustum);
classSplitWorldLayer->addProperty< float >("fieldOfView", &SplitWorldLayer::setFieldOfView, &SplitWorldLayer::getFieldOfView);
classSplitWorldLayer->addProperty< double >("alternateTime", &SplitWorldLayer::setAlternateTime, &SplitWorldLayer::getAlternateTime);
classSplitWorldLayer->addProperty< float >("feedbackScale", &SplitWorldLayer::setFeedbackScale, &SplitWorldLayer::getFeedbackScale);
// classSplitWorldLayer->addProperty< const world::Entity* >("camera", &SplitWorldLayer::setCamera, &SplitWorldLayer::getCamera);
classSplitWorldLayer->addMethod("createEntity", &SplitWorldLayer::createEntity);
classSplitWorldLayer->addMethod("setControllerEnable", &SplitWorldLayer::setControllerEnable);
Expand Down Expand Up @@ -358,7 +357,6 @@ void GameClassFactory::createClasses(IRuntimeClassRegistrar* registrar) const
classWorldLayer->addProperty< const Frustum& >("viewFrustum", &WorldLayer::getViewFrustum);
classWorldLayer->addProperty< float >("fieldOfView", &WorldLayer::setFieldOfView, &WorldLayer::getFieldOfView);
classWorldLayer->addProperty< double >("alternateTime", &WorldLayer::setAlternateTime, &WorldLayer::getAlternateTime);
classWorldLayer->addProperty< float >("feedbackScale", &WorldLayer::setFeedbackScale, &WorldLayer::getFeedbackScale);
classWorldLayer->addProperty< const world::Entity* >("camera", &WorldLayer::setCamera, &WorldLayer::getCamera);
classWorldLayer->addMethod("createEntity", &WorldLayer::createEntity);
classWorldLayer->addMethod("setControllerEnable", &WorldLayer::setControllerEnable);
Expand Down
22 changes: 0 additions & 22 deletions code/Spark/Runtime/SparkLayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,25 +143,10 @@ SparkLayer::SparkLayer(
, m_lastMouseX(-1)
, m_lastMouseY(-1)
{
// Register ourself for UI shake.
//if (m_environment->getWorld())
//{
// spray::IFeedbackManager* feedbackManager = m_environment->getWorld()->getFeedbackManager();
// if (feedbackManager)
// feedbackManager->addListener(spray::FbtUI, this);
//}
}

void SparkLayer::destroy()
{
// Remove ourself from feedback manager.
//if (m_environment && m_environment->getWorld())
//{
// spray::IFeedbackManager* feedbackManager = m_environment->getWorld()->getFeedbackManager();
// if (feedbackManager)
// feedbackManager->removeListener(spray::FbtUI, this);
//}

m_environment = nullptr;
m_movie.clear();
m_externalMovies.clear();
Expand Down Expand Up @@ -620,11 +605,4 @@ void SparkLayer::createMoviePlayer()
}
}

void SparkLayer::feedbackValues(spray::FeedbackType type, const float* values, int32_t count)
{
T_ASSERT(count >= 3);
m_offset = Vector2(values[0] * 0.01f, values[1] * 0.01f);
m_scale = values[2] * 0.01f + 1.0f;
}

}
27 changes: 9 additions & 18 deletions code/Spark/Runtime/SparkLayer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "Core/Math/Vector2.h"
#include "Resource/Id.h"
#include "Resource/Proxy.h"
#include "Spray/Feedback/IFeedbackListener.h"

// import/export mechanism.
#undef T_DLLCLASS
Expand All @@ -23,24 +22,22 @@
# define T_DLLCLASS T_DLLIMPORT
#endif

namespace traktor
namespace traktor::runtime
{
namespace runtime
{

class IEnvironment;

}
}

namespace render
{
namespace traktor::render
{

class IRenderTargetSet;

}
}

namespace spark
{
namespace traktor::spark
{

class AccDisplayRenderer;
class Context;
Expand All @@ -53,14 +50,12 @@ class ISoundRenderer;
/*! Stage Spark layer.
* \ingroup Spark
*/
class T_DLLCLASS SparkLayer
: public runtime::Layer
, public spray::IFeedbackListener
class T_DLLCLASS SparkLayer : public runtime::Layer
{
T_RTTI_CLASS;

public:
SparkLayer(
explicit SparkLayer(
runtime::Stage* stage,
const std::wstring& name,
bool permitTransition,
Expand Down Expand Up @@ -168,10 +163,6 @@ class T_DLLCLASS SparkLayer
int32_t m_lastMouseY;

void createMoviePlayer();

virtual void feedbackValues(spray::FeedbackType type, const float* values, int32_t count) override final;
};

}
}

0 comments on commit c552ade

Please sign in to comment.