Stuff I've fixed so far.

This commit is contained in:
2023-01-19 20:24:43 -08:00
parent e60002b8dc
commit 97fd59f28d
12 changed files with 72 additions and 43 deletions

View File

@ -4,6 +4,7 @@
// https://opensource.org/licenses/MIT
#include "SimpleTexturedMaterial.hpp"
#include "game/DawnGame.hpp"
using namespace Dawn;
@ -13,5 +14,5 @@ SimpleTexturedMaterial::SimpleTexturedMaterial(SceneItem *i) :
}
Shader * SimpleTexturedMaterial::getShader() {
return this->shader;
return &this->getGame()->renderManager.simpleShader;
}

View File

@ -4,13 +4,11 @@
// https://opensource.org/licenses/MIT
#pragma once
#include "display/shader/SimpleTexturedShader.hpp"
#include "scene/components/display/Material.hpp"
namespace Dawn {
class SimpleTexturedMaterial : public Material {
public:
SimpleTexturedShader *shader = nullptr;
Texture *texture = nullptr;
struct Color color = COLOR_WHITE;