mirror of
https://github.com/lucaspalomodevelop/meshlab.git
synced 2026-03-17 18:14:38 +00:00
added:
MeshRenderInterface *iRender; void setRender(MeshRenderInterface *); MeshRenderInterface * getRender();
This commit is contained in:
parent
481ad640b6
commit
a4c72b8c7b
@ -24,6 +24,12 @@
|
||||
History
|
||||
|
||||
$Log$
|
||||
Revision 1.48 2005/12/05 18:09:08 ggangemi
|
||||
added:
|
||||
MeshRenderInterface *iRender;
|
||||
void setRender(MeshRenderInterface *);
|
||||
MeshRenderInterface * getRender();
|
||||
|
||||
Revision 1.47 2005/12/05 12:16:46 ggangemi
|
||||
iRendersList -> iDecoratorsList
|
||||
|
||||
@ -202,6 +208,7 @@ using namespace vcg;
|
||||
GLArea::GLArea(QWidget *parent)
|
||||
: QGLWidget(parent)
|
||||
{
|
||||
iRender=0; //MeshRender support
|
||||
iDecoratorsList=0;
|
||||
currentTime=0;
|
||||
lastTime=0;
|
||||
@ -388,8 +395,16 @@ void GLArea::paintGL()
|
||||
glColorMaterial(GL_FRONT_AND_BACK,GL_AMBIENT_AND_DIFFUSE);
|
||||
}
|
||||
|
||||
if(iRender) {
|
||||
iRender->Render(new QAction("Toon Shader", this), *mm, rm, this);
|
||||
}
|
||||
|
||||
mm->Render(rm.drawMode,rm.colorMode,rm.textureMode);
|
||||
|
||||
if(iRender) {
|
||||
glUseProgramObjectARB(0);
|
||||
}
|
||||
|
||||
if(iDecoratorsList){
|
||||
pair<QAction *,MeshDecorateInterface *> p;
|
||||
foreach(p,*iDecoratorsList){p.second->Decorate(p.first,*mm,rm,this);}
|
||||
@ -658,4 +673,7 @@ void GLArea::updateFps()
|
||||
for (int i=0;i<10;i++) averageFps+=fpsVector[i];
|
||||
cfps=1000.0f/(averageFps/10);
|
||||
}
|
||||
void GLArea::resetTrackBall(){trackball.Reset();updateGL();}
|
||||
void GLArea::resetTrackBall(){trackball.Reset();updateGL();}
|
||||
|
||||
void GLArea::setRender(MeshRenderInterface * rend) { iRender = rend; }
|
||||
MeshRenderInterface * GLArea::getRender() { return iRender; }
|
||||
@ -24,6 +24,12 @@
|
||||
History
|
||||
|
||||
$Log$
|
||||
Revision 1.33 2005/12/05 18:09:08 ggangemi
|
||||
added:
|
||||
MeshRenderInterface *iRender;
|
||||
void setRender(MeshRenderInterface *);
|
||||
MeshRenderInterface * getRender();
|
||||
|
||||
Revision 1.32 2005/12/05 12:16:46 ggangemi
|
||||
iRendersList -> iDecoratorsList
|
||||
|
||||
@ -241,6 +247,11 @@ public:
|
||||
void resetTrackBall();
|
||||
list<pair<QAction *,MeshDecorateInterface *> > *iDecoratorsList;
|
||||
|
||||
//shader support
|
||||
MeshRenderInterface *iRender;
|
||||
void setRender(MeshRenderInterface *);
|
||||
MeshRenderInterface * getRender();
|
||||
|
||||
protected:
|
||||
void initializeGL();
|
||||
void initTexture();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user