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-utils/src/HitEffect.cpp (1 of 46 files). Show all

Unified · Split

libraries/render-utils/src/HitEffect.cpp+5−5
@@ -62,19 +62,19 @@ const gpu::PipelinePointer& HitEffect::getHitEffectPipeline() { · 61 unmodified lines
6262
6363 void HitEffect::run(const render::SceneContextPointer& sceneContext, const render::RenderContextPointer& renderContext) {
6464 assert(renderContext->args);
65− assert(renderContext->args->_viewFrustum);
65+ assert(renderContext->args->hasViewFrustum());
6666 RenderArgs* args = renderContext->args;
6767
6868 gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
69−
69+
7070 glm::mat4 projMat;
7171 Transform viewMat;
72− args->_viewFrustum->evalProjectionMatrix(projMat);
73− args->_viewFrustum->evalViewTransform(viewMat);
72+ args->getViewFrustum().evalProjectionMatrix(projMat);
73+ args->getViewFrustum().evalViewTransform(viewMat);
7474 batch.setProjectionTransform(projMat);
7575 batch.setViewTransform(viewMat);
7676 batch.setModelTransform(Transform());
77−
77+
7878 batch.setPipeline(getHitEffectPipeline());
7979
8080 glm::vec4 color(0.0f, 0.0f, 0.0f, 1.0f);

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