Skip to content

Commit

Permalink
Include parenting check in depth sorting. Optimize depth sorting. (#1893
Browse files Browse the repository at this point in the history 
)
  • Loading branch information
@MortimerGoro @bluemarvin
MortimerGoro authored and bluemarvin committed Oct 1, 2019
1 parent ff3e710 commit 6cb0462
Show file tree
Hide file tree
Showing 2 changed files with 109 additions and 57 deletions.
165 changes: 109 additions & 56 deletions app/src/main/cpp/BrowserWorld.cpp
View file
Expand Up @@ -57,6 +57,7 @@
#include <array>
#include <functional>
#include <fstream>
#include <unordered_map>

#define ASSERT_ON_RENDER_THREAD(X) \
if (m.context && !m.context->IsOnRenderThread()) { \
Expand Down Expand Up @@ -184,6 +185,7 @@ struct BrowserWorld::State {
PerformanceMonitorPtr monitor;
WidgetMoverPtr movingWidget;
WidgetResizerPtr widgetResizer;
std::unordered_map<vrb::Node*, std::pair<Widget*, float>> depthSorting;

State() : paused(true), glInitialized(false), modelsLoaded(false), env(nullptr), cylinderDensity(0.0f), nearClip(0.1f),
farClip(300.0f), activity(nullptr), windowsInitialized(false), exitImmersiveRequested(false), loaderDelay(0) {
Expand Down Expand Up @@ -221,6 +223,9 @@ struct BrowserWorld::State {
void UpdateControllers(bool& aRelayoutWidgets);
WidgetPtr GetWidget(int32_t aHandle) const;
WidgetPtr FindWidget(const std::function<bool(const WidgetPtr&)>& aCondition) const;
bool IsParent(const Widget& aChild, const Widget& aParent) const;
float ComputeNormalizedZ(const Widget& aWidget) const;
void SortWidgets();
};

void
Expand Down Expand Up @@ -545,6 +550,108 @@ BrowserWorld::State::FindWidget(const std::function<bool(const WidgetPtr&)>& aCo
return {};
}

bool
BrowserWorld::State::IsParent(const Widget& aChild, const Widget& aParent) const {
if (aChild.GetPlacement()->parentHandle == aParent.GetHandle()) {
return true;
}

if (aChild.GetPlacement()->parentHandle > 0) {
WidgetPtr next = GetWidget(aChild.GetPlacement()->parentHandle);
if (next) {
return IsParent(*next, aParent);
}
}

return false;
}

float
BrowserWorld::State::ComputeNormalizedZ(const Widget& aWidget) const {
const vrb::Vector headPosition = device->GetHeadTransform().GetTranslation();
const vrb::Vector headDirection = device->GetHeadTransform().MultiplyDirection(vrb::Vector(0.0f, 0.0f, -1.0f));

vrb::Vector hitPoint;
vrb::Vector normal;
bool inside = false;
float distance;
if (aWidget.GetQuad()) {
aWidget.GetQuad()->TestIntersection(headPosition, headDirection, hitPoint, normal, true, inside, distance);
} else if (aWidget.GetCylinder()) {
aWidget.GetCylinder()->TestIntersection(headPosition, headDirection, hitPoint, normal, true, inside, distance);
}

const vrb::Matrix& projection = device->GetCamera(device::Eye::Left)->GetPerspective();
const vrb::Matrix& view = device->GetCamera(device::Eye::Left)->GetView();
vrb::Matrix viewProjection = projection.PostMultiply(view);

vrb::Vector ndc = viewProjection.MultiplyPosition(hitPoint);

return ndc.z();
}

void
BrowserWorld::State::SortWidgets() {
depthSorting.clear();

// Compute normalized z for each widget
for (int i = 0; i < rootTransparent->GetNodeCount(); ++i) {
vrb::NodePtr node = rootTransparent->GetNode(i);
Widget * target = nullptr;
float zDelta = 0.0f;
for (const auto & widget: widgets) {
if (widget->GetRoot() == node) {
target = widget.get();
break;
}
}
if (!target) {
for (Controller& controller: controllers->GetControllers()) {
if (controller.pointer && controller.pointer->GetRoot() == node) {
target = controller.pointer->GetHitWidget().get();
zDelta = 0.02f;
break;
}
}
}

if (!target && widgetResizer && widgetResizer->GetRoot() == node) {
target = widgetResizer->GetWidget();
zDelta = 0.01f;
}

if (!target || !target->IsVisible()) {
depthSorting.emplace(node.get(), std::make_pair(target, 1.0f));
continue;
}

const float z = ComputeNormalizedZ(*target) - zDelta;

depthSorting.emplace(node.get(), std::make_pair(target, z));
}

// Sort nodes based on cached depth values
rootTransparent->SortNodes([=](const NodePtr& a, const NodePtr& b) {
auto da = depthSorting.find(a.get());
auto db = depthSorting.find(b.get());
Widget* wa = da->second.first;
Widget* wb = db->second.first;

// Parenting sort
if (wa && wb && IsParent(*wa, *wb)) {
return true;
} else if (wa && wb && IsParent(*wb, *wa)) {
return false;
}

// Depth sort
return da->second.second < db->second.second;
});



}

static BrowserWorldPtr sWorldInstance;

BrowserWorld&
Expand Down Expand Up @@ -1199,11 +1306,8 @@ BrowserWorld::DrawWorld() {
if (m.skybox) {
m.skybox->SetTransform(vrb::Matrix::Translation(headPosition));
}
m.rootTransparent->SortNodes([=](const NodePtr& a, const NodePtr& b) {
float da = ComputeNormalizedZ(a);
float db = ComputeNormalizedZ(b);
return da < db;
});

m.SortWidgets();
m.device->StartFrame();
m.rootOpaque->SetTransform(m.device->GetReorientTransform());
m.rootTransparent->SetTransform(m.device->GetReorientTransform());
Expand Down Expand Up @@ -1361,57 +1465,6 @@ BrowserWorld::CreateSkyBox(const std::string& aBasePath, const std::string& aExt
}
}

float
BrowserWorld::ComputeNormalizedZ(const vrb::NodePtr& aNode) const {
Widget * target = nullptr;
float zDelta = 0.0f;
for (const auto & widget: m.widgets) {
if (widget->GetRoot() == aNode) {
target = widget.get();
break;
}
}
if (!target) {
for (Controller& controller: m.controllers->GetControllers()) {
if (controller.pointer && controller.pointer->GetRoot() == aNode) {
target = controller.pointer->GetHitWidget().get();
zDelta = 0.02f;
break;
}
}
}

if (!target && m.widgetResizer && m.widgetResizer ->GetRoot() == aNode) {
target = m.widgetResizer->GetWidget();
zDelta = 0.01f;
}

if (!target) {
return 1.0f;
}

const vrb::Vector headPosition = m.device->GetHeadTransform().GetTranslation();
const vrb::Vector headDirection = m.device->GetHeadTransform().MultiplyDirection(vrb::Vector(0.0f, 0.0f, -1.0f));

vrb::Vector hitPoint;
vrb::Vector normal;
bool inside = false;
float distance;
if (target->GetQuad()) {
target->GetQuad()->TestIntersection(headPosition, headDirection, hitPoint, normal, false, inside, distance);
} else if (target->GetCylinder()) {
target->GetCylinder()->TestIntersection(headPosition, headDirection, hitPoint, normal, false, inside, distance);
}

const vrb::Matrix& projection = m.device->GetCamera(device::Eye::Left)->GetPerspective();
const vrb::Matrix& view = m.device->GetCamera(device::Eye::Left)->GetView();
vrb::Matrix viewProjection = projection.PostMultiply(view);

vrb::Vector ndc = viewProjection.MultiplyPosition(hitPoint);

return ndc.z() - zDelta;
}

} // namespace crow


Expand Down
1 change: 0 additions & 1 deletion app/src/main/cpp/BrowserWorld.h
View file
Expand Up @@ -72,7 +72,6 @@ class BrowserWorld {
void DrawLoadingAnimation();
void DrawSplashAnimation();
void CreateSkyBox(const std::string& aBasePath, const std::string& aExtension);
float ComputeNormalizedZ(const vrb::NodePtr& aNode) const;
private:
State& m;
BrowserWorld() = delete;
Expand Down

0 comments on commit 6cb0462

Please sign in to comment.