Font working
This commit is contained in:
		| @@ -87,7 +87,7 @@ void Shader::setVector3(shaderparameter_t uniform, glm::vec3 vector) { | ||||
|  | ||||
| void Shader::setTexture( | ||||
|   shaderparameter_t param, | ||||
|   std::shared_ptr<Texture> texture | ||||
|   Texture *texture | ||||
| ) { | ||||
|   if(texture == nullptr || !texture->isReady()) { | ||||
|     this->bindTexture(param, nullptr); | ||||
|   | ||||
| @@ -51,7 +51,7 @@ namespace Dawn { | ||||
|        */ | ||||
|       virtual void bindTexture( | ||||
|         shaderparameter_t param, | ||||
|         std::shared_ptr<Texture> texture | ||||
|         Texture *texture | ||||
|       ) = 0; | ||||
|  | ||||
|  | ||||
| @@ -75,10 +75,7 @@ namespace Dawn { | ||||
|       void setBoolean(shaderparameter_t parameter, bool_t value) override; | ||||
|       void setColor(shaderparameter_t parameter, struct Color color) override; | ||||
|       void setVector3(shaderparameter_t parameter, glm::vec3 vector) override; | ||||
|       void setTexture( | ||||
|         shaderparameter_t parameter, | ||||
|         std::shared_ptr<Texture> texture | ||||
|       ) override; | ||||
|       void setTexture(shaderparameter_t parameter, Texture *texture) override; | ||||
|  | ||||
|       /** | ||||
|        * Destroys and deletes the shader from the GPU. | ||||
|   | ||||
| @@ -43,7 +43,7 @@ namespace Dawn { | ||||
|  | ||||
|       void bindTexture( | ||||
|         shaderparameter_t param, | ||||
|         std::shared_ptr<Texture> texture | ||||
|         Texture *texture | ||||
|       ) override { | ||||
|         if(texture == nullptr) { | ||||
|           this->setBoolean(this->paramHasTexture, false); | ||||
|   | ||||
| @@ -43,7 +43,7 @@ namespace Dawn { | ||||
|  | ||||
|       void bindTexture( | ||||
|         shaderparameter_t param, | ||||
|         std::shared_ptr<Texture> texture | ||||
|         Texture *texture | ||||
|       ) override { | ||||
|         if(texture == nullptr) { | ||||
|           this->setBoolean(this->paramHasTexture, false); | ||||
| @@ -108,7 +108,7 @@ namespace Dawn { | ||||
|         this->setMatrix(this->paramModel, model); | ||||
|       } | ||||
|  | ||||
|       void setUITexture(std::shared_ptr<Texture> texture) { | ||||
|       void setUITexture(Texture *texture) { | ||||
|         this->bindTexture(this->paramTexture, texture); | ||||
|       } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user