comparison: src/text.c
src/text.c
- changeset 40
- 6c438be1a1fd
- parent 38
- 6e5629ea4c5c
- child 41
- df81d493716e
equal
deleted
inserted
replaced
| 39:7cf310cc47cb | 40:6c438be1a1fd |
|---|---|
| 36 if (node->color.alpha == 0 || node->hidden || node->tex_id == 0) { | 36 if (node->color.alpha == 0 || node->hidden || node->tex_id == 0) { |
| 37 return; | 37 return; |
| 38 } | 38 } |
| 39 | 39 |
| 40 // Upload model matrix | 40 // Upload model matrix |
| 41 glUniformMatrix4fv(ASC_SHADER_FONT.base.model, 1, | 41 glUniformMatrix4fv(ASC_SHADER_SPRITE.base.model, 1, |
| 42 GL_FALSE, node->base.final_transform); | 42 GL_FALSE, node->base.final_transform); |
| 43 | 43 |
| 44 // Upload surface | 44 // Upload surface |
| 45 glActiveTexture(GL_TEXTURE0); | 45 glActiveTexture(GL_TEXTURE0); |
| 46 glBindTexture(GL_TEXTURE_RECTANGLE, node->tex_id); | 46 glBindTexture(GL_TEXTURE_RECTANGLE, node->tex_id); |
| 47 glUniform1i(ASC_SHADER_FONT.surface, 0); | 47 glUniform1i(ASC_SHADER_SPRITE.surface, 0); |
| 48 | 48 |
| 49 // Draw mesh | 49 // Draw mesh |
| 50 asc_primitives_draw_plane(); | 50 asc_primitives_draw_plane(); |
| 51 } | 51 } |
| 52 | 52 |
