archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix for collision modifier not reseted after first run + made the pushpin more like one

Browse Source
This commit is contained in:
Daniel Genrich
2008-01-23 17:58:09 +00:00
parent 4b1b749130
commit 576a7f623c
3 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/cloth.c
View File

@@ -621,6 +621,12 @@ void clothModifier_do ( ClothModifierData *clmd, Object *ob, DerivedMesh *dm,
clmd->sim_parms->dt = 1.0f / clmd->sim_parms->stepsPerFrame;
clmd->sim_parms->sim_time = current_time;
/* check if cache is active / if file is already saved */
if ((!G.relbase_valid) && ( deltaTime != 1.0f ))
{
clmd->sim_parms->flags |= CLOTH_SIMSETTINGS_FLAG_RESET;
}
if(clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_RESET)
{

6
source/blender/blenkernel/intern/modifier.c
View File

@@ -5130,6 +5130,8 @@ static void collisionModifier_deformVerts(
current_time = bsystem_time ( ob, ( float ) G.scene->r.cfra, 0.0 );
// printf("current_time %f, collmd->time %f\n", current_time, collmd->time);
if(current_time > collmd->time)
{
numverts = dm->getNumVerts ( dm );
@@ -5194,6 +5196,10 @@ static void collisionModifier_deformVerts(
collmd->time = current_time;
}
else
{
collmd->time = current_time;
}
}
if(dm)

42
source/blender/src/drawobject.c
View File

@@ -5421,7 +5421,13 @@ void draw_object(Base *base, int flag)
if(!(clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_RESET))
{
verts = cloth->verts;
/*
// this makes the screen pink
glEnable(GL_LIGHTING);
glEnable(GL_COLOR_MATERIAL);
glShadeModel(GL_SMOOTH);
*/
for(i = 0; i < cloth->numverts; i++)
{
if(verts[i].flags & CLOTH_VERT_FLAG_PINNED)
@@ -5443,27 +5449,49 @@ void draw_object(Base *base, int flag)
glScalef(size[0], size[1], size[2]);
// gluSphere(qobj, 1.0, 8, 5);
glTranslatef(0, 0, 1.0);
gluDisk(qobj, 0, 0.4, 8, 5);
gluCylinder(qobj, 0.4, 0.4, 1.0, 8, 5);
glTranslatef(0, 0, 1.0);
gluDisk(qobj, 0, 0.4, 8, 5);
gluDisk(qobj, 0, 0.25, 8, 5);
glTranslatef(0, 0, -2.0);
glTranslatef(0, 0, -1.0);
glTranslatef(0, 0, 0.875);
gluCylinder(qobj, 0.15, 0.25, 0.125, 8, 5);
glTranslatef(0, 0, -0.25);
gluCylinder(qobj, 0.15, 0.15, 0.25, 8, 5);
glTranslatef(0, 0, -0.125);
gluCylinder(qobj, 0.25, 0.15, 0.125, 8, 5);
// gluDisk(qobj, 0, 0.5, 8, 5);
/*
glTranslatef(0, 0, 1.0);
gluDisk(qobj, 0, 0.4, 8, 5);
*/
/*
col[0] = 0.53;
col[1] = 0.54;
col[2] = 0.0;
glColor3fv(col);
*/
gluCylinder(qobj, 0.0, 0.2, 1.0, 8, 5);
glTranslatef(0, 0, -0.5);
gluCylinder(qobj, 0.0, 0.05, 0.5, 8, 5);
glTranslatef(0, 0, 0.5);
gluDisk(qobj, 0, 0.25, 8, 5);
glPopMatrix();
gluDeleteQuadric(qobj);
}
}
/*
glShadeModel(GL_FLAT);
glDisable(GL_COLOR_MATERIAL);
glDisable(GL_LIGHTING);
*/
}
}
}