Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-16 06:00:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove last qApp usage from Avatar class

Browse source
This commit is contained in:
Andrew Meadows 2017-04-12 12:20:12 -07:00
parent 685a01482c
commit 5a458c9923
7 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -5098,6 +5098,7 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
renderArgs->setViewFrustum(_displayViewFrustum); renderArgs->setViewFrustum(_displayViewFrustum);
} }
renderArgs->_cameraMode = (int8_t)theCamera.getMode(); // HACK renderArgs->_cameraMode = (int8_t)theCamera.getMode(); // HACK
renderArgs->_scene = getMain3DScene();
_renderEngine->getRenderContext()->args = renderArgs; _renderEngine->getRenderContext()->args = renderArgs;
// Before the deferred pass, let's try to use the render engine // Before the deferred pass, let's try to use the render engine

2
interface/src/Application.h
View file

@ -268,7 +268,7 @@ public:
int getMaxOctreePacketsPerSecond() const; int getMaxOctreePacketsPerSecond() const;
render::ScenePointer getMain3DScene() override { return _main3DScene; } render::ScenePointer getMain3DScene() override { return _main3DScene; }
render::ScenePointer getMain3DScene() const { return _main3DScene; } const render::ScenePointer& getMain3DScene() const { return _main3DScene; }
render::EnginePointer getRenderEngine() override { return _renderEngine; } render::EnginePointer getRenderEngine() override { return _renderEngine; }
gpu::ContextPointer getGPUContext() const { return _gpuContext; } gpu::ContextPointer getGPUContext() const { return _gpuContext; }

6
interface/src/avatar/Avatar.cpp
View file

@ -72,7 +72,7 @@ namespace render {
if (avatarPtr->isInitialized() && args) { if (avatarPtr->isInitialized() && args) {
PROFILE_RANGE_BATCH(*args->_batch, "renderAvatarPayload"); PROFILE_RANGE_BATCH(*args->_batch, "renderAvatarPayload");
// TODO AVATARS_RENDERER: remove need for qApp // TODO AVATARS_RENDERER: remove need for qApp
avatarPtr->render(args, qApp->getMain3DScene()); avatarPtr->render(args);
} }
} }
template <> uint32_t metaFetchMetaSubItems(const AvatarSharedPointer& avatar, ItemIDs& subItems) { template <> uint32_t metaFetchMetaSubItems(const AvatarSharedPointer& avatar, ItemIDs& subItems) {
@ -579,7 +579,7 @@ void Avatar::postUpdate(float deltaTime) {
} }
} }
void Avatar::render(RenderArgs* renderArgs, const render::ScenePointer& scene) { void Avatar::render(RenderArgs* renderArgs) {
auto& batch = *renderArgs->_batch; auto& batch = *renderArgs->_batch;
PROFILE_RANGE_BATCH(batch, __FUNCTION__); PROFILE_RANGE_BATCH(batch, __FUNCTION__);
@ -651,7 +651,7 @@ void Avatar::render(RenderArgs* renderArgs, const render::ScenePointer& scene) {
float distanceToTarget = glm::length(toTarget); float distanceToTarget = glm::length(toTarget);
{ {
fixupModelsInScene(scene); fixupModelsInScene(renderArgs->_scene);
if (renderArgs->_renderMode != RenderArgs::SHADOW_RENDER_MODE) { if (renderArgs->_renderMode != RenderArgs::SHADOW_RENDER_MODE) {
// add local lights // add local lights

2
interface/src/avatar/Avatar.h
View file

@ -81,7 +81,7 @@ public:
void simulate(float deltaTime, bool inView); void simulate(float deltaTime, bool inView);
virtual void simulateAttachments(float deltaTime); virtual void simulateAttachments(float deltaTime);
virtual void render(RenderArgs* renderArgs, const render::ScenePointer& scene); virtual void render(RenderArgs* renderArgs);
void addToScene(AvatarSharedPointer self, std::shared_ptr<render::Scene> scene, void addToScene(AvatarSharedPointer self, std::shared_ptr<render::Scene> scene,
render::Transaction& transaction); render::Transaction& transaction);

5
interface/src/avatar/MyAvatar.cpp
View file

@ -752,13 +752,12 @@ controller::Pose MyAvatar::getRightHandTipPose() const {
} }
// virtual // virtual
void MyAvatar::render(RenderArgs* renderArgs, const render::ScenePointer& scene) { void MyAvatar::render(RenderArgs* renderArgs) {
// don't render if we've been asked to disable local rendering // don't render if we've been asked to disable local rendering
if (!_shouldRender) { if (!_shouldRender) {
return; // exit early return; // exit early
} }
Avatar::render(renderArgs);
Avatar::render(renderArgs, scene);
} }
void MyAvatar::overrideAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame) { void MyAvatar::overrideAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame) {

2
interface/src/avatar/MyAvatar.h
View file

@ -525,7 +525,7 @@ private:
void simulate(float deltaTime); void simulate(float deltaTime);
void updateFromTrackers(float deltaTime); void updateFromTrackers(float deltaTime);
virtual void render(RenderArgs* renderArgs, const render::ScenePointer& scene) override; virtual void render(RenderArgs* renderArgs) override;
virtual bool shouldRenderHead(const RenderArgs* renderArgs) const override; virtual bool shouldRenderHead(const RenderArgs* renderArgs) const override;
void setShouldRenderLocally(bool shouldRender) { _shouldRender = shouldRender; setEnableMeshVisible(shouldRender); } void setShouldRenderLocally(bool shouldRender) { _shouldRender = shouldRender; setEnableMeshVisible(shouldRender); }
bool getShouldRenderLocally() const { return _shouldRender; } bool getShouldRenderLocally() const { return _shouldRender; }

5
libraries/shared/src/RenderArgs.h
View file

@ -23,6 +23,10 @@
class AABox; class AABox;
class OctreeRenderer; class OctreeRenderer;
namespace render {
class Scene;
using ScenePointer = std::shared_ptr<Scene>;
}
namespace gpu { namespace gpu {
class Batch; class Batch;
@ -126,6 +130,7 @@ public:
bool _enableTexturing { true }; bool _enableTexturing { true };
RenderDetails _details; RenderDetails _details;
render::ScenePointer _scene; // HACK
int8_t _cameraMode { -1 }; // HACK int8_t _cameraMode { -1 }; // HACK
}; };