History

Squashed scribe changes

Bradley Austin Davis committed 8 years ago

Commit fd007e81 parent 6b8bfdb38 files · +421 −322Browse files

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

Unified · Split

libraries/render-utils/src/AnimDebugDraw.cpp+4−4
@@ -13,12 +13,12 @@ · 12 unmodified lines
13#include <gpu/Batch.h>13#include <gpu/Batch.h>
14#include <GLMHelpers.h>14#include <GLMHelpers.h>
15 15
16#include "animdebugdraw_vert.h"
17#include "animdebugdraw_frag.h"
18#include "AbstractViewStateInterface.h"16#include "AbstractViewStateInterface.h"
19#include "RenderUtilsLogging.h"17#include "RenderUtilsLogging.h"
20#include "DebugDraw.h"18#include "DebugDraw.h"
21 19
20#include "animdebugdraw_vert.h"
21#include "animdebugdraw_frag.h"
22 22
23class AnimDebugDrawData {23class AnimDebugDrawData {
24public:24public:
@@ -102,8 +102,8 @@ AnimDebugDraw::AnimDebugDraw() : · 77 unmodified lines
102 state->setBlendFunction(false, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD,102 state->setBlendFunction(false, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD,
103 gpu::State::INV_SRC_ALPHA, gpu::State::FACTOR_ALPHA,103 gpu::State::INV_SRC_ALPHA, gpu::State::FACTOR_ALPHA,
104 gpu::State::BLEND_OP_ADD, gpu::State::ONE);104 gpu::State::BLEND_OP_ADD, gpu::State::ONE);
105 auto vertShader = gpu::Shader::createVertex(std::string(animdebugdraw_vert));105 auto vertShader = animdebugdraw_vert::getShader();
106 auto fragShader = gpu::Shader::createPixel(std::string(animdebugdraw_frag));106 auto fragShader = animdebugdraw_frag::getShader();
107 auto program = gpu::Shader::createProgram(vertShader, fragShader);107 auto program = gpu::Shader::createProgram(vertShader, fragShader);
108 _pipeline = gpu::Pipeline::create(program, state);108 _pipeline = gpu::Pipeline::create(program, state);
109 109

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