summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Bosveld <joel@joel-desktop.(none)>2008-01-28 14:32:17 +0900
committerJoel Bosveld <joel@joel-desktop.(none)>2008-01-28 14:32:17 +0900
commit3488db512ee238f131ad59f755288efd806fa338 (patch)
tree76f1b31d2e82668b85a44ccf388d5083ee4ac44c
parent191906345d057c4aaeb008549bc3d05d4c647897 (diff)
downloadcubedbus-3488db512ee238f131ad59f755288efd806fa338.tar.gz
cubedbus-3488db512ee238f131ad59f755288efd806fa338.tar.bz2
Fix 2 mistakes
-rw-r--r--cubedbusParticle.c.in16
-rw-r--r--particleFx/emitter.c.in2
2 files changed, 13 insertions, 5 deletions
diff --git a/cubedbusParticle.c.in b/cubedbusParticle.c.in
index b8e11ba..dd93975 100644
--- a/cubedbusParticle.c.in
+++ b/cubedbusParticle.c.in
@@ -120,7 +120,9 @@ cubedbusAddParticleObject (CubedbusObject *obj, CompOption *option, int nOption)
particle->dataSets[0].data = malloc (sizeof (CompFxParticleEmitterParticleData) * particle->dataSets[0].nData);
particle->dataSets[0].name= malloc (sizeof (char) * 10);
strcpy (particle->dataSets[0].name, "position");
- particle->dataSets[0].data->compFxParticleEmitterAddDataProc = &compFxParticleEmitterAddDataStandard;
+ particle->dataSets[0].data[0].compFxParticleEmitterAddDataProc = &compFxParticleEmitterAddDataStandard;
+ particle->dataSets[0].data[1].compFxParticleEmitterAddDataProc = &compFxParticleEmitterAddDataStandard;
+ particle->dataSets[0].data[2].compFxParticleEmitterAddDataProc = &compFxParticleEmitterAddDataStandard;
particle->dataSets[0].data[0].data = malloc (sizeof(CompFxParticleData));
particle->dataSets[0].data[1].data = malloc (sizeof(CompFxParticleData));
particle->dataSets[0].data[2].data = malloc (sizeof(CompFxParticleData));
@@ -129,7 +131,9 @@ cubedbusAddParticleObject (CubedbusObject *obj, CompOption *option, int nOption)
particle->dataSets[1].data = malloc (sizeof (CompFxParticleEmitterParticleData) * particle->dataSets[1].nData);
particle->dataSets[1].name= malloc (sizeof (char) * 10);
strcpy (particle->dataSets[1].name, "velocity");
- particle->dataSets[1].data->compFxParticleEmitterAddDataProc = &compFxParticleEmitterAddDataStandard;
+ particle->dataSets[1].data[0].compFxParticleEmitterAddDataProc = &compFxParticleEmitterAddDataStandard;
+ particle->dataSets[1].data[1].compFxParticleEmitterAddDataProc = &compFxParticleEmitterAddDataStandard;
+ particle->dataSets[1].data[2].compFxParticleEmitterAddDataProc = &compFxParticleEmitterAddDataStandard;
particle->dataSets[1].data[0].data = malloc (sizeof(CompFxParticleData));
particle->dataSets[1].data[1].data = malloc (sizeof(CompFxParticleData));
particle->dataSets[1].data[2].data = malloc (sizeof(CompFxParticleData));
@@ -138,7 +142,9 @@ cubedbusAddParticleObject (CubedbusObject *obj, CompOption *option, int nOption)
particle->dataSets[2].data = malloc (sizeof (CompFxParticleEmitterParticleData) * particle->dataSets[2].nData);
particle->dataSets[2].name= malloc (sizeof (char) * 10);
strcpy (particle->dataSets[2].name, "colour");
- particle->dataSets[2].data->compFxParticleEmitterAddDataProc = &compFxParticleEmitterAddDataStandard;
+ particle->dataSets[2].data[0].compFxParticleEmitterAddDataProc = &compFxParticleEmitterAddDataStandard;
+ particle->dataSets[2].data[1].compFxParticleEmitterAddDataProc = &compFxParticleEmitterAddDataStandard;
+ particle->dataSets[2].data[2].compFxParticleEmitterAddDataProc = &compFxParticleEmitterAddDataStandard;
particle->dataSets[2].data[0].data = malloc (sizeof(CompFxParticleData));
particle->dataSets[2].data[1].data = malloc (sizeof(CompFxParticleData));
particle->dataSets[2].data[2].data = malloc (sizeof(CompFxParticleData));
@@ -168,7 +174,9 @@ cubedbusAddParticleObject (CubedbusObject *obj, CompOption *option, int nOption)
particle->dataSets[6].data = malloc (sizeof (CompFxParticleEmitterParticleData) * particle->dataSets[6].nData);
particle->dataSets[6].name= malloc (sizeof (char) * 12);
strcpy (particle->dataSets[6].name, "acceleration");
- particle->dataSets[6].data->compFxParticleEmitterAddDataProc = &compFxParticleEmitterAddDataStandard;
+ particle->dataSets[6].data[0].compFxParticleEmitterAddDataProc = &compFxParticleEmitterAddDataStandard;
+ particle->dataSets[6].data[1].compFxParticleEmitterAddDataProc = &compFxParticleEmitterAddDataStandard;
+ particle->dataSets[6].data[2].compFxParticleEmitterAddDataProc = &compFxParticleEmitterAddDataStandard;
particle->dataSets[6].data[0].data = malloc (sizeof(CompFxParticleData));
particle->dataSets[6].data[1].data = malloc (sizeof(CompFxParticleData));
particle->dataSets[6].data[2].data = malloc (sizeof(CompFxParticleData));
diff --git a/particleFx/emitter.c.in b/particleFx/emitter.c.in
index a03f692..8f953ec 100644
--- a/particleFx/emitter.c.in
+++ b/particleFx/emitter.c.in
@@ -57,7 +57,7 @@ compFxParticleInitiate (CompFxParticle *particle, CompFxParticleEmitterParticleD
if(particle->dataSets[i].data == NULL); /* XXX error XXX */
for(i2=0; i2 < data->dataSets[i].nData;i2++)
{
- compFxParticleEmitterAddDataStandard (particle->dataSets[i].data + i2 , data->dataSets[i].data + i2) /* (data->dataSets[i].data[i2].compFxParticleEmitterAddDataProc) ( &(particle->dataSets[i].data[i2]), &(data->dataSets[i].data[i2])) */;
+ (data->dataSets[i].data[i2].compFxParticleEmitterAddDataProc) (particle->dataSets[i].data + i2 , data->dataSets[i].data + i2) ;
}
}
}