History

use references not pointers for ViewFrustums

also unravelling some spaghetti: (1) split Octree stuff out of ViewFrustum (2) moved ViewFrustum from octree to shared lib (3) removed some cruft

Andrew Meadows committed 10 years ago

Commit bcf2cc81 parent 21fa29446 files · +412 −390Browse files

Showing the changes to libraries/render/src/render/DrawSceneOctree.cpp (1 of 46 files). Show all

Unified · Split

libraries/render/src/render/DrawSceneOctree.cpp+8−7
@@ -14,6 +14,7 @@ · 13 unmodified lines
1414 #include <algorithm>
1515 #include <assert.h>
1616
17+#include <OctreeUtils.h>
1718 #include <PerfStat.h>
1819 #include <RenderArgs.h>
1920
@@ -86,7 +87,7 @@ void DrawSceneOctree::configure(const Config& config) { · 66 unmodified lines
8687 void DrawSceneOctree::run(const SceneContextPointer& sceneContext,
8788 const RenderContextPointer& renderContext, const ItemSpatialTree::ItemSelection& inSelection) {
8889 assert(renderContext->args);
89− assert(renderContext->args->_viewFrustum);
90+ assert(renderContext->args->hasViewFrustum());
9091 RenderArgs* args = renderContext->args;
9192 auto& scene = sceneContext->_scene;
9293
@@ -97,8 +98,8 @@ void DrawSceneOctree::run(const SceneContextPointer& sceneContext, · 4 unmodified lines
9798 gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
9899 glm::mat4 projMat;
99100 Transform viewMat;
100− args->_viewFrustum->evalProjectionMatrix(projMat);
101− args->_viewFrustum->evalViewTransform(viewMat);
101+ args->getViewFrustum().evalProjectionMatrix(projMat);
102+ args->getViewFrustum().evalViewTransform(viewMat);
102103 batch.setViewportTransform(args->_viewport);
103104
104105 batch.setProjectionTransform(projMat);
@@ -148,7 +149,7 @@ void DrawSceneOctree::run(const SceneContextPointer& sceneContext, · 43 unmodified lines
148149 }
149150 // Draw the LOD Reticle
150151 {
151− float angle = glm::degrees(args->_viewFrustum->getAccuracyAngle(args->_sizeScale, args->_boundaryLevelAdjust));
152+ float angle = glm::degrees(getAccuracyAngle(args->_sizeScale, args->_boundaryLevelAdjust));
152153 Transform crosshairModel;
153154 crosshairModel.setTranslation(glm::vec3(0.0, 0.0, -1000.0));
154155 crosshairModel.setScale(1000.0 * tan(glm::radians(angle))); // Scaling at the actual tan of the lod angle => Multiplied by TWO
@@ -198,15 +199,15 @@ void DrawItemSelection::configure(const Config& config) { · 43 unmodified lines
198199 void DrawItemSelection::run(const SceneContextPointer& sceneContext,
199200 const RenderContextPointer& renderContext, const ItemSpatialTree::ItemSelection& inSelection) {
200201 assert(renderContext->args);
201− assert(renderContext->args->_viewFrustum);
202+ assert(renderContext->args->hasViewFrustum());
202203 RenderArgs* args = renderContext->args;
203204 auto& scene = sceneContext->_scene;
204205
205206 gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
206207 glm::mat4 projMat;
207208 Transform viewMat;
208− args->_viewFrustum->evalProjectionMatrix(projMat);
209− args->_viewFrustum->evalViewTransform(viewMat);
209+ args->getViewFrustum().evalProjectionMatrix(projMat);
210+ args->getViewFrustum().evalViewTransform(viewMat);
210211 batch.setViewportTransform(args->_viewport);
211212
212213 batch.setProjectionTransform(projMat);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t