Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 11:07:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix build failures after parabola merge

Browse source
This commit is contained in:
Brad Davis 2018-07-30 16:06:39 -07:00 committed by Bradley Austin Davis
parent df031b5d93
commit 6ed7512112
4 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/src/raypick/ParabolaPointer.cpp
View file

@ -12,11 +12,9 @@
#include <StencilMaskPass.h> #include <StencilMaskPass.h>
#include <DependencyManager.h> #include <DependencyManager.h>
#include <shaders/Shaders.h>
#include "ParabolaPick.h" #include "ParabolaPick.h"
#include "render-utils/parabola_vert.h"
#include "render-utils/parabola_frag.h"
const glm::vec4 ParabolaPointer::RenderState::ParabolaRenderItem::DEFAULT_PARABOLA_COLOR { 1.0f }; const glm::vec4 ParabolaPointer::RenderState::ParabolaRenderItem::DEFAULT_PARABOLA_COLOR { 1.0f };
const float ParabolaPointer::RenderState::ParabolaRenderItem::DEFAULT_PARABOLA_WIDTH { 0.01f }; const float ParabolaPointer::RenderState::ParabolaRenderItem::DEFAULT_PARABOLA_WIDTH { 0.01f };
const bool ParabolaPointer::RenderState::ParabolaRenderItem::DEFAULT_PARABOLA_ISVISIBLEINSECONDARYCAMERA { false }; const bool ParabolaPointer::RenderState::ParabolaRenderItem::DEFAULT_PARABOLA_ISVISIBLEINSECONDARYCAMERA { false };
@ -326,13 +324,7 @@ void ParabolaPointer::RenderState::ParabolaRenderItem::updateKey() {
const gpu::PipelinePointer ParabolaPointer::RenderState::ParabolaRenderItem::getParabolaPipeline() { const gpu::PipelinePointer ParabolaPointer::RenderState::ParabolaRenderItem::getParabolaPipeline() {
if (!_parabolaPipeline || !_transparentParabolaPipeline) { if (!_parabolaPipeline || !_transparentParabolaPipeline) {
auto vs = parabola_vert::getShader(); gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::parabola);
auto ps = parabola_frag::getShader();
gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
gpu::Shader::BindingSet slotBindings;
slotBindings.insert(gpu::Shader::Binding(std::string("parabolaData"), 0));
gpu::Shader::makeProgram(*program, slotBindings);
{ {
auto state = std::make_shared<gpu::State>(); auto state = std::make_shared<gpu::State>();

4
libraries/render-utils/src/parabola.slf
View file

@ -9,9 +9,9 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
in vec4 _color; layout(location=0) in vec4 _color;
out vec4 _fragColor; layout(location=0) out vec4 _fragColor;
void main(void) { void main(void) {
_fragColor = _color; _fragColor = _color;

4
libraries/render-utils/src/parabola.slv
View file

@ -12,7 +12,7 @@
<@include gpu/Transform.slh@> <@include gpu/Transform.slh@>
<$declareStandardTransform()$> <$declareStandardTransform()$>
layout(std140) uniform parabolaData { layout(std140, binding=0) uniform parabolaData {
vec3 velocity; vec3 velocity;
float parabolicDistance; float parabolicDistance;
vec3 acceleration; vec3 acceleration;
@ -22,7 +22,7 @@ layout(std140) uniform parabolaData {
ivec3 spare; ivec3 spare;
}; };
out vec4 _color; layout(location=0) out vec4 _color;
void main(void) { void main(void) {
_color = color; _color = color;

2
libraries/shaders/CMakeLists.txt
View file

@ -69,6 +69,8 @@ AUTOSCRIBE_PROGRAM(NAME simple_textured_unlit_fade VERTEX simple_fade)
AUTOSCRIBE_PROGRAM(NAME simple_transparent_textured_fade VERTEX simple_fade) AUTOSCRIBE_PROGRAM(NAME simple_transparent_textured_fade VERTEX simple_fade)
AUTOSCRIBE_PROGRAM(NAME simple_transparent_textured_unlit_fade VERTEX simple_fade) AUTOSCRIBE_PROGRAM(NAME simple_transparent_textured_unlit_fade VERTEX simple_fade)
AUTOSCRIBE_PROGRAM(NAME parabola)
AUTOSCRIBE_PROGRAM(NAME sdf_text3D) AUTOSCRIBE_PROGRAM(NAME sdf_text3D)
AUTOSCRIBE_PROGRAM(NAME sdf_text3D_transparent VERTEX sdf_text3D) AUTOSCRIBE_PROGRAM(NAME sdf_text3D_transparent VERTEX sdf_text3D)