YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Testing textures and events

Browse Source
This commit is contained in:
Dominic Masters
2022-10-20 15:49:25 -07:00
parent 375b25ff59
commit 80d6cba854
27 changed files with 513 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/dawnopengl/display/shader/SimpleTexturedShader.hpp
View File

@ -24,7 +24,7 @@ namespace Dawn {
ps[this->paramColor] = SHADER_PARAMETER_TYPE_COLOR;
ps[this->paramHasTexture] = SHADER_PARAMETER_TYPE_BOOLEAN;
// ps[paramTexture] SHADER_PARAMETER_TYPE_TEXTURE;
ps[this->paramTexture] = SHADER_PARAMETER_TYPE_TEXTURE;
return ps;
}
@ -42,6 +42,19 @@ namespace Dawn {
this->setMatrix(this->paramModel, transform);
}
void bindTexture(
shaderparameter_t param,
std::shared_ptr<Texture> texture
) override {
if(texture == nullptr) {
this->setBoolean(this->paramHasTexture, false);
} else {
this->setBoolean(this->paramHasTexture, true);
this->setTextureSlot(param, 0x00);
texture->bind(0x00);
}
}
void compile() override {
this->compileShader(
// Vertex Shader