#include "meshbuilder.h"
#include "program.h"
#include "renderer.h"
+#include "technique.h"
#include "text.h"
#include "texture2d.h"
Text::Text(const Font &f, const Technique *tech, Tag tex_slot):
ObjectInstance(object),
font(f),
- mesh((TEXCOORD2, VERTEX2)),
- horz_align(0.0f),
- vert_offset(0.0f),
- width(0.0f)
+ mesh((TEXCOORD2, VERTEX2))
{
object.set_mesh(&mesh);
if(tech)
{
if(tech)
{
- if(!tex_slot.id && tech->has_pass(Tag()))
- if(const Program *shprog = tech->get_pass(Tag()).get_shader_program())
+ if(!tex_slot.id && tech->has_method(Tag()))
+ if(const Program *shprog = tech->get_method(Tag()).get_shader_program())
{
if(shprog->get_uniform_location(Tag("font_tex"))>=0)
tex_slot = "font_tex";
unsigned n_vertices = mesh.get_n_vertices();
for(unsigned i=0; i<n_vertices; ++i)
{
- float *pos = mesh.modify_vertex(i)+pos_offset;
+ float *pos = reinterpret_cast<float *>(mesh.modify_vertex(i)+pos_offset);
pos[0] += horz_adjust;
pos[1] += vert_adjust;
}