Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove Camera argument from Avatar::render()

Browse source
This commit is contained in:
Andrew Meadows 2017-04-12 11:25:39 -07:00
parent fbacbd74f7
commit 685a01482c
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

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

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

@ -72,7 +72,7 @@ namespace render {
if (avatarPtr->isInitialized() && args) {
PROFILE_RANGE_BATCH(*args->_batch, "renderAvatarPayload");
// TODO AVATARS_RENDERER: remove need for qApp
avatarPtr->render(args, qApp->getMain3DScene(), qApp->getCamera());
avatarPtr->render(args, qApp->getMain3DScene());
}
}
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, const Camera& camera) {
void Avatar::render(RenderArgs* renderArgs, const render::ScenePointer& scene) {
auto& batch = *renderArgs->_batch;
PROFILE_RANGE_BATCH(batch, __FUNCTION__);
@ -680,9 +680,7 @@ void Avatar::render(RenderArgs* renderArgs, const render::ScenePointer& scene, c
const float DISPLAYNAME_DISTANCE = 20.0f;
setShowDisplayName(distanceToTarget < DISPLAYNAME_DISTANCE);
// TODO AVATARS_RENDERER: remove need for 'camera' in this context
auto cameraMode = camera.getMode();
if (!isMyAvatar() || cameraMode != CAMERA_MODE_FIRST_PERSON) {
if (!isMyAvatar() || renderArgs->_cameraMode != (int8_t)CAMERA_MODE_FIRST_PERSON) {
auto& frustum = renderArgs->getViewFrustum();
auto textPosition = getDisplayNamePosition();
if (frustum.pointIntersectsFrustum(textPosition)) {

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

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

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

@ -752,13 +752,13 @@ controller::Pose MyAvatar::getRightHandTipPose() const {
}
// virtual
void MyAvatar::render(RenderArgs* renderArgs, const render::ScenePointer& scene, const Camera& camera) {
void MyAvatar::render(RenderArgs* renderArgs, const render::ScenePointer& scene) {
// don't render if we've been asked to disable local rendering
if (!_shouldRender) {
return; // exit early
}
Avatar::render(renderArgs, scene, camera);
Avatar::render(renderArgs, scene);
}
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 updateFromTrackers(float deltaTime);
virtual void render(RenderArgs* renderArgs, const render::ScenePointer& scene, const Camera& camera) override;
virtual void render(RenderArgs* renderArgs, const render::ScenePointer& scene) override;
virtual bool shouldRenderHead(const RenderArgs* renderArgs) const override;
void setShouldRenderLocally(bool shouldRender) { _shouldRender = shouldRender; setEnableMeshVisible(shouldRender); }
bool getShouldRenderLocally() const { return _shouldRender; }

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

@ -126,6 +126,7 @@ public:
bool _enableTexturing { true };
RenderDetails _details;
int8_t _cameraMode { -1 }; // HACK
};
#endif // hifi_RenderArgs_h