First pass of new shader manager
This commit is contained in:
1 parent
a52f54b3e6
commit
095a60e5dc
26 files changed
+302
-31
No files matched your search
@@ -5,7 +5,7 @@
|
||||
|
||||
#pragma once
|
||||
#include "scene/SceneItemComponent.hpp"
|
||||
#include "display/shader/Shader.hpp"
|
||||
#include "display/shader/ShaderManager.hpp"
|
||||
|
||||
namespace Dawn {
|
||||
class Material : public SceneItemComponent {
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
#pragma once
|
||||
#include "scene/SceneItemComponent.hpp"
|
||||
#include "UICanvas.hpp"
|
||||
#include "display/shader/Shader.hpp"
|
||||
#include "util/mathutils.hpp"
|
||||
|
||||
namespace Dawn {
|
||||
|
||||
@@ -29,7 +29,7 @@ std::vector<struct ShaderPassItem> UIImage::getPassItems(
|
||||
glm::mat4 proj, glm::mat4 view
|
||||
) {
|
||||
struct ShaderPassItem item;
|
||||
auto shader = &getGame()->renderManager.uiShaderProgram;
|
||||
auto shader = &getGame()->renderManager.uiShader->program;
|
||||
item.shaderProgram = shader;
|
||||
item.colorValues[shader->paramColor] = this->color;
|
||||
item.matrixValues[shader->paramProjection] = proj;
|
||||
|
||||
@@ -63,7 +63,7 @@ std::vector<struct ShaderPassItem> UILabel::getPassItems(
|
||||
this->updateMesh();
|
||||
|
||||
struct ShaderPassItem item;
|
||||
auto shader = &getGame()->renderManager.uiShaderProgram;
|
||||
auto shader = &getGame()->renderManager.uiShader->program;
|
||||
item.shaderProgram = shader;
|
||||
item.colorValues[shader->paramColor] = textColor;
|
||||
item.matrixValues[shader->paramProjection] = proj;
|
||||
|
||||
Reference in new issue
Block a user