fixes for unity release

melowntech · Mar 21, 2019 · 44f8aa4 · 44f8aa4
1 parent 9018b25
commit 44f8aa4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/browser/src/vts-libbrowser/resources/resource.cpp b/browser/src/vts-libbrowser/resources/resource.cpp
@@ -110,10 +110,19 @@ void Resource::updatePriority(float p)
 void Resource::updateAvailability(const std::shared_ptr<vtslibs::registry
     ::BoundLayer::Availability> &availTest)
 {
-    if (!fetch)
-        fetch = std::make_shared<FetchTaskImpl>(map->resources.resources[name]);
-    if (!fetch->availTest)
-        fetch->availTest = availTest;
+    auto f = fetch;
+    if (f)
+    {
+        if (!f->availTest)
+            f->availTest = availTest;
+    }
+    else
+    {
+        f = std::make_shared<FetchTaskImpl>(
+            map->resources.resources[name]);
+        f->availTest = availTest;
+        fetch = f;
+    }
 }
 
 void Resource::forceRedownload()

diff --git a/browser/src/vts-librenderer/renderer.cpp b/browser/src/vts-librenderer/renderer.cpp
@@ -414,13 +414,15 @@ class RendererImpl
             glDisable(GL_BLEND);
             glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
             shaderSurface->bind();
+            enableClipDistance(true);
             for (const DrawTask &it : draws->opaque)
             {
                 DrawTask t(it);
                 t.flatShading = false;
                 t.color[0] = t.color[1] = t.color[2] = t.color[3] = 0;
                 drawSurface(t);
             }
+            enableClipDistance(false);
             glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
             glEnable(GL_BLEND);
             CHECK_GL("rendered polygon edges");