Commit 7efbfcdc authored by zmoelnig's avatar zmoelnig
Browse files

mainly rearranged the order of appearance of member/variables in the initializer;

[vertex_model] now uses glmTexture() rather than the nonexistant glmLinearTexture()


git-svn-id: https://pd-gem.svn.sourceforge.net/svnroot/pd-gem/trunk/Gem@2831 49b2a0ca-c541-4d49-a7ef-d785e4371512
parent dfe0455c
......@@ -13,7 +13,6 @@
// WARRANTIES, see the file, "GEM.LICENSE.TERMS" in this distribution.
//
/////////////////////////////////////////////////////////
#if 1
#include "multimodel.h"
#include <stdio.h>
......@@ -35,9 +34,9 @@ multimodel :: multimodel(t_symbol *filename, t_floatarg baseModel,
: m_loadedCache(NULL),
m_numModels(0), m_curModel(-1),
m_rescaleModel(1),
m_textype(GLM_TEX_DEFAULT),
m_rebuild(true),
m_currentH(1.f), m_currentW(1.f),
m_textype(GLM_TEX_DEFAULT)
m_currentH(1.f), m_currentW(1.f)
{
inlet_new(this->x_obj, &this->x_obj->ob_pd, &s_float, gensym("mdl_num"));
......@@ -356,5 +355,4 @@ void multimodel :: rescaleMessCallback(void *data, t_floatarg state)
void multimodel :: textureMessCallback(void *data, t_floatarg state)
{
GetMyClass(data)->textureMess((int)state);
}
#endif
}
\ No newline at end of file
......@@ -35,9 +35,8 @@ glsl_program :: glsl_program() :
m_symname(NULL), m_size(NULL), m_type(NULL), m_loc(NULL),
m_param(NULL), m_flag(NULL), m_linked(0), m_wantLink(false),
m_num(0),
m_geoInType(GL_TRIANGLES), m_geoOutType(GL_TRIANGLE_STRIP), m_geoOutVertices(-1),
m_outProgramID(NULL)
m_outProgramID(NULL),
m_geoInType(GL_TRIANGLES), m_geoOutType(GL_TRIANGLE_STRIP), m_geoOutVertices(-1)
{
int i=0;
for(i=0; i<MAX_NUM_SHADERS; i++) {
......
......@@ -93,7 +93,7 @@ void vertex_model :: openMess(t_symbol *filename)
group = m_model->groups;
glmFacetNormals (m_model);
glmVertexNormals(m_model, 90);
glmLinearTexture(m_model);
glmTexture(m_model, GLM_TEX_DEFAULT, 1, 1);
post("model->numtriangles %d",m_model->numtriangles);
post("model->numgroups %d",m_model->numgroups);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment