Improved web entity rendering

* fading now works properly * web browsers are now fully opaque.

Anthony J. Thibault committed 10 years ago

Commit e82f6a91 parent 8d5a8967 files · +112 −36Browse files

Showing the changes to libraries/render-utils/src/GeometryCache.cpp (1 of 7 files). Show all

Unified · Split

libraries/render-utils/src/GeometryCache.cpp+42−11

 #include "simple_vert.h"
 #include "simple_textured_frag.h"
 #include "simple_textured_unlit_frag.h"
-#include "simple_srgb_textured_unlit_no_tex_alpha_frag.h"
+#include "simple_opaque_web_browser_frag.h"
+#include "simple_transparent_web_browser_frag.h"
 #include "glowLine_vert.h"
 #include "glowLine_geom.h"
 #include "glowLine_frag.h"
     return a.getRaw() == b.getRaw();
 }
-void GeometryCache::bindSimpleSRGBTexturedUnlitNoTexAlphaProgram(gpu::Batch& batch) {
+void GeometryCache::bindOpaqueWebBrowserProgram(gpu::Batch& batch) {
-    batch.setPipeline(getSimpleSRGBTexturedUnlitNoTexAlphaPipeline());
+    batch.setPipeline(getOpaqueWebBrowserProgram());
     // Set a default normal map
     batch.setResourceTexture(render::ShapePipeline::Slot::MAP::NORMAL_FITTING,
-        DependencyManager::get<TextureCache>()->getNormalFittingTexture());
+                             DependencyManager::get<TextureCache>()->getNormalFittingTexture());
+}
+gpu::PipelinePointer GeometryCache::getOpaqueWebBrowserProgram() {
+    static std::once_flag once;
+    std::call_once(once, [&]() {
+        auto VS = gpu::Shader::createVertex(std::string(simple_vert));
+        auto PS = gpu::Shader::createPixel(std::string(simple_opaque_web_browser_frag));
+        _simpleOpaqueWebBrowserShader = gpu::Shader::createProgram(VS, PS);
+        gpu::Shader::BindingSet slotBindings;
+        slotBindings.insert(gpu::Shader::Binding(std::string("normalFittingMap"), render::ShapePipeline::Slot::MAP::NORMAL_FITTING));
+        gpu::Shader::makeProgram(*_simpleOpaqueWebBrowserShader, slotBindings);
+        auto state = std::make_shared<gpu::State>();
+        state->setCullMode(gpu::State::CULL_NONE);
+        state->setDepthTest(true, true, gpu::LESS_EQUAL);
+        state->setBlendFunction(false,
+                                gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
+                                gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
+        _simpleOpaqueWebBrowserPipeline = gpu::Pipeline::create(_simpleOpaqueWebBrowserShader, state);
+    });
+    return _simpleOpaqueWebBrowserPipeline;
+}
+void GeometryCache::bindTransparentWebBrowserProgram(gpu::Batch& batch) {
+    batch.setPipeline(getTransparentWebBrowserProgram());
+    // Set a default normal map
+    batch.setResourceTexture(render::ShapePipeline::Slot::MAP::NORMAL_FITTING,
+                             DependencyManager::get<TextureCache>()->getNormalFittingTexture());
 }
-gpu::PipelinePointer GeometryCache::getSimpleSRGBTexturedUnlitNoTexAlphaPipeline() {
+gpu::PipelinePointer GeometryCache::getTransparentWebBrowserProgram() {
-    // Compile the shaders, once
     static std::once_flag once;
     std::call_once(once, [&]() {
         auto VS = gpu::Shader::createVertex(std::string(simple_vert));
-        auto PS = gpu::Shader::createPixel(std::string(simple_srgb_textured_unlit_no_tex_alpha_frag));
+        auto PS = gpu::Shader::createPixel(std::string(simple_transparent_web_browser_frag));
-        _simpleSRGBTexturedUnlitNoTexAlphaShader = gpu::Shader::createProgram(VS, PS);
+        _simpleTransparentWebBrowserShader = gpu::Shader::createProgram(VS, PS);
         gpu::Shader::BindingSet slotBindings;
         slotBindings.insert(gpu::Shader::Binding(std::string("normalFittingMap"), render::ShapePipeline::Slot::MAP::NORMAL_FITTING));
-        gpu::Shader::makeProgram(*_simpleSRGBTexturedUnlitNoTexAlphaShader, slotBindings);
+        gpu::Shader::makeProgram(*_simpleTransparentWebBrowserShader, slotBindings);
         auto state = std::make_shared<gpu::State>();
         state->setCullMode(gpu::State::CULL_NONE);
         state->setDepthTest(true, true, gpu::LESS_EQUAL);
                                 gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
                                 gpu::State::FACTOR_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::ONE);
-        _simpleSRGBTexturedUnlitNoTexAlphaPipeline = gpu::Pipeline::create(_simpleSRGBTexturedUnlitNoTexAlphaShader, state);
+        _simpleTransparentWebBrowserPipeline = gpu::Pipeline::create(_simpleTransparentWebBrowserShader, state);
     });
-    return _simpleSRGBTexturedUnlitNoTexAlphaPipeline;
+    return _simpleTransparentWebBrowserPipeline;
 }
 void GeometryCache::bindSimpleProgram(gpu::Batch& batch, bool textured, bool transparent, bool culled, bool unlit, bool depthBiased) {

Improved web entity rendering

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code