Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[IFxEffectDef] Add the structs provided by @aerosoul94

Browse Source
This commit is contained in:
momo5502 2016-12-07 22:08:13 +01:00
parent dfa50dc1bb
commit 81d94cbd5e
2 changed files with 119 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Components/Modules/AssetInterfaces/IFxEffectDef.cpp
View File

@ -21,10 +21,13 @@ namespace Assets
Components::Logger::Error("Effect needs to be updated from the legacy format.\n");
}
for (int i = 0; i < FX_ELEM_FIELD_COUNT; ++i)
{
Game::s_elemFields[i].handler(nullptr, nullptr);
}
Game::FxEditorEffectDef efx;
ZeroMemory(&efx, sizeof(efx));
// for (int i = 0; i < FX_ELEM_FIELD_COUNT; ++i)
// {
// Game::s_elemFields[i].handler(&session, efx.elems);
// }
Game::Com_EndParseSession();
}

125
src/Game/Structs.hpp
View File

@ -1930,19 +1930,6 @@ namespace Game
FX_ELEM_TYPE_LAST_DRAWN = 0x9,
};
#define FX_ELEM_FIELD_COUNT 90
struct FxEditorElemDef
{
// Uh...
};
struct FxElemField
{
const char *keyName;
bool(__cdecl *handler)(const char**, FxEditorElemDef*);
};
struct FxElemVec3Range
{
float base[3];
@ -2154,6 +2141,118 @@ namespace Game
FxElemDef *elemDefs; //Count = elemDefCountOneShot + elemDefCountEmission + elemDefCountLooping
};
#define FX_ELEM_FIELD_COUNT 90
struct FxEditorElemAtlas
{
int behavior;
int index;
int fps;
int loopCount;
int indexRange;
int colIndexBits;
int rowIndexBits;
int entryCount;
};
struct FxCurve
{
int dimensionCount;
int keyCount;
float keys[1];
};
struct FxEditorTrailDef
{
FxTrailVertex verts[64];
int vertCount;
unsigned __int16 inds[128];
int indCount;
};
struct FxEditorElemDef
{
char name[48];
int editorFlags;
int flags;
FxFloatRange spawnRange;
FxFloatRange fadeInRange;
FxFloatRange fadeOutRange;
float spawnFrustumCullRadius;
FxSpawnDefLooping spawnLooping;
FxSpawnDefOneShot spawnOneShot;
FxIntRange spawnDelayMsec;
FxIntRange lifeSpanMsec;
FxFloatRange spawnOrigin[3];
FxFloatRange spawnOffsetRadius;
FxFloatRange spawnOffsetHeight;
FxFloatRange spawnAngles[3];
FxFloatRange angularVelocity[3];
FxFloatRange initialRotation;
FxFloatRange gravity;
FxFloatRange elasticity;
FxEditorElemAtlas atlas;
float velScale[2][3];
FxCurve *velShape[2][3][2];
float rotationScale;
FxCurve *rotationShape[2];
float sizeScale[2];
FxCurve *sizeShape[2][2];
float scaleScale;
FxCurve *scaleShape[2];
FxCurve *color[2];
FxCurve *alpha[2];
float lightingFrac;
float decalFadeInTime;
float collOffset[3];
float collRadius;
FxEffectDef *effectOnImpact;
FxEffectDef *effectOnDeath;
int sortOrder;
FxEffectDef *emission;
FxFloatRange emitDist;
FxFloatRange emitDistVariance;
char elemType;
__declspec(align(4)) int visualCount;
union
{
FxElemVisuals visuals[32];
FxElemMarkVisuals markVisuals[16];
} visuals;
int trailSplitDist;
int trailSplitArcDist;
int trailSplitTime;
int trailRepeatDist;
float trailScrollTime;
FxEditorTrailDef trailDef;
int sparkFountainGravity;
int sparkFountainBounceFrac;
int sparkFountainBounceRand;
int sparkFountainSparkSpacing;
int sparkFountainSparkLength;
int sparkFountainSparkCount;
int sparkFountainLoopTime;
int sparkFountainVelMin;
int sparkFountainVelMax;
int sparkFountainVelConeAngle;
int sparkFountainRestSpeed;
int sparkFountainBoostTime;
int sparkFountainBoostFactor;
};
struct FxEditorEffectDef
{
char name[64];
int elemCount;
FxEditorElemDef elems[32];
};
struct FxElemField
{
const char *keyName;
bool(__cdecl *handler)(const char**, FxEditorElemDef*);
};
struct cPlane
{
vec3_t a;