Commit 1a9ca776 authored by Phillip Stephens's avatar Phillip Stephens

Update ScriptObject DNAs to match known values

parent cdf9545d
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<MarkdownNavigatorCodeStyleSettings>
<option name="RIGHT_MARGIN" value="72" />
</MarkdownNavigatorCodeStyleSettings>
<Objective-C>
<option name="INDENT_NAMESPACE_MEMBERS" value="0" />
<option name="INDENT_C_STRUCT_MEMBERS" value="2" />
......
......@@ -12,6 +12,6 @@ struct AIJumpPoint : IScriptObject {
Value<atVec3f> location;
Value<atVec3f> orientation;
Value<bool> active;
Value<float> unknown1;
Value<float> apex;
};
} // namespace DataSpec::DNAMP1
......@@ -9,11 +9,11 @@ struct AIKeyframe : IScriptObject {
AT_DECL_DNA_YAML
AT_DECL_DNAV
String<-1> name;
Value<atUint32> unknown1;
Value<bool> unknown2;
Value<float> unknown3;
Value<bool> unknown4;
Value<atUint32> unknown5;
Value<float> unknown6;
Value<atUint32> animationId;
Value<bool> looping;
Value<float> lifetime;
Value<bool> active;
Value<atUint32> fadeOut;
Value<float> totalPlayback;
};
} // namespace DataSpec::DNAMP1
......@@ -12,10 +12,10 @@ struct ActorContraption : IScriptObject {
Value<atVec3f> location;
Value<atVec3f> orientation;
Value<atVec3f> scale;
Value<atVec3f> unknown1;
Value<atVec3f> scanOffset;
Value<float> unknown2;
Value<float> unknown3;
Value<atVec3f> collisionExtent;
Value<atVec3f> collisionOrigin;
Value<float> mass;
Value<float> zMomentum;
HealthInfo healthInfo;
DamageVulnerability damageVulnerability;
AnimationParameters animationParameters;
......
......@@ -11,8 +11,8 @@ struct ActorRotate : IScriptObject {
String<-1> name;
Value<atVec3f> rotationOffset;
Value<float> timeScale;
Value<bool> unknown1;
Value<bool> unknown2;
Value<bool> updateActors;
Value<bool> updateOnCreation;
Value<bool> active;
};
} // namespace DataSpec::DNAMP1
......@@ -10,15 +10,15 @@ struct AreaAttributes : IScriptObject {
AT_DECL_DNAV
enum class EWeatherType : atUint32 { None, Snow, Rain };
Value<atUint32> unknown1;
Value<atUint32> load; /* 0 causes the loader to bail and return null */
Value<bool> skyboxEnabled;
Value<EWeatherType> weather;
Value<float> unknown2;
Value<float> unknown3;
Value<float> unknown4;
Value<float> unknown5;
Value<float> envFxDensity;
Value<float> thermalHeat;
Value<float> xrayFogDistance;
Value<float> worldLightingLevel;
UniqueID32 skybox;
Value<atUint32> unknown6;
Value<atUint32> phazonType;
void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut, std::vector<hecl::ProjectPath>& lazyOut) const {
g_curSpec->flattenDependencies(skybox, pathsOut);
......
......@@ -17,11 +17,11 @@ struct AtomicAlpha : IScriptObject {
UniqueID32 wpsc;
UniqueID32 model;
DamageInfo damageInfo;
Value<float> unknown1;
Value<float> unknown2;
Value<float> unknown3;
Value<bool> unknown4;
Value<bool> unknown5;
Value<float> bombDropDelay;
Value<float> bombReappearDelay;
Value<float> bombReappearTime;
Value<bool> invisible;
Value<bool> applyBeamAttraction;
void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const {
actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
......
......@@ -11,11 +11,11 @@ struct BallTrigger : IScriptObject {
String<-1> name;
Value<atVec3f> location;
Value<atVec3f> volume;
Value<bool> unknown1;
Value<float> unknown2;
Value<float> unknown3;
Value<float> unknown4;
Value<atVec3f> unknown5;
Value<bool> unknown6;
Value<bool> active;
Value<float> force;
Value<float> minAngle;
Value<float> maxDistance;
Value<atVec3f> forceAngle;
Value<bool> stopPlayer;
};
} // namespace DataSpec::DNAMP1
......@@ -13,15 +13,15 @@ struct Camera : IScriptObject {
Value<atVec3f> orientation;
Value<bool> active;
Value<float> shotDuration;
Value<bool> unknown3;
Value<bool> unknown4;
Value<bool> unknown5;
Value<bool> unknown6;
Value<bool> unknown7;
Value<bool> lookAtPlayer;
Value<bool> outOfPlayerEye;
Value<bool> intoPlayerEye;
Value<bool> drawPlayer;
Value<bool> disableInput;
Value<bool> unknown9;
Value<bool> unknown;
Value<bool> finishCineSkip;
Value<float> fov;
Value<bool> unknown11;
Value<bool> unknown12;
Value<bool> checkFailsafe;
Value<bool> disableOutOfInto;
};
} // namespace DataSpec::DNAMP1
......@@ -12,9 +12,9 @@ struct CameraPitchVolume : IScriptObject {
Value<atVec3f> location;
Value<atVec3f> orientation;
Value<atVec3f> volume;
Value<bool> unknown1;
Value<float> unknown2;
Value<float> unknown3;
Value<float> unknown4;
Value<bool> active;
Value<float> upPitch;
Value<float> downPitch;
Value<float> scale;
};
} // namespace DataSpec::DNAMP1
......@@ -12,7 +12,7 @@ struct CameraWaypoint : IScriptObject {
Value<atVec3f> location;
Value<atVec3f> orientation;
Value<bool> active;
Value<float> unknown2;
Value<float> hFov;
Value<atUint32> unknown3;
};
} // namespace DataSpec::DNAMP1
......@@ -9,9 +9,9 @@ struct Counter : IScriptObject {
AT_DECL_DNA_YAML
AT_DECL_DNAV
String<-1> name;
Value<atUint32> startValue; // needs verification
Value<atUint32> initial;
Value<atUint32> maxValue;
Value<bool> unknown1;
Value<bool> unknown2;
Value<bool> autoReset;
Value<bool> active;
};
} // namespace DataSpec::DNAMP1
......@@ -11,11 +11,11 @@ struct CoverPoint : IScriptObject {
String<-1> name;
Value<atVec3f> location;
Value<atVec3f> orientation;
Value<bool> unknown1;
Value<atUint32> unknown2;
Value<bool> unknown3;
Value<float> unknown4;
Value<float> unknown5;
Value<float> unknown6;
Value<bool> active;
Value<atUint32> flags;
Value<bool> crouch;
Value<float> horizontalAngle;
Value<float> verticleAngle;
Value<float> coverTime;
};
} // namespace DataSpec::DNAMP1
......@@ -9,7 +9,7 @@ struct DockAreaChange : IScriptObject {
AT_DECL_DNA_YAML
AT_DECL_DNAV
String<-1> name;
Value<atUint32> unknown1;
Value<bool> unknown2;
Value<atUint32> dockReference;
Value<bool> active;
};
} // namespace DataSpec::DNAMP1
......@@ -11,13 +11,13 @@ struct ElectroMagneticPulse : IScriptObject {
String<-1> name;
Value<atVec3f> location;
Value<atVec3f> orientation;
Value<bool> unknown1;
Value<float> unknown2;
Value<float> unknown3;
Value<float> unknown4;
Value<float> unknown5;
Value<bool> active;
Value<float> initialRadius;
Value<float> finalRadius;
Value<float> duration;
Value<float> interferenceDur;
Value<float> unknown6;
Value<float> unknown7;
Value<float> interferenceMag;
Value<float> unknown8;
UniqueID32 particle;
......
......@@ -9,8 +9,8 @@ struct EnvFxDensityController : IScriptObject {
AT_DECL_DNA_YAML
AT_DECL_DNAV
String<-1> name;
Value<bool> unknown1;
Value<float> unknown2;
Value<atUint32> unknown3;
Value<bool> active;
Value<float> density;
Value<atUint32> maxDensityDeltaSpeed;
};
} // namespace DataSpec::DNAMP1
......@@ -15,9 +15,9 @@ struct FlickerBat : IScriptObject {
Value<atVec3f> scale;
PatternedInfo patternedInfo;
ActorParameters actorParameters;
Value<bool> unknown2;
Value<bool> unknown3;
Value<bool> unknown4;
Value<bool> collider;
Value<bool> startsHidden;
Value<bool> enableLineOfSight;
void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const {
actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
......
......@@ -11,9 +11,9 @@ struct FogVolume : IScriptObject {
String<-1> name;
Value<atVec3f> location;
Value<atVec3f> volume;
Value<float> unknown1;
Value<float> flickerSpeed;
Value<float> unknown2;
Value<atVec4f> unkonwn3;
Value<bool> unknown4;
Value<atVec4f> fogColor;
Value<bool> active;
};
} // namespace DataSpec::DNAMP1
......@@ -14,16 +14,16 @@ struct Geemer : IScriptObject {
Value<atVec3f> scale;
PatternedInfo patternedInfo;
ActorParameters actorParameters;
Value<float> unknown1;
Value<float> advanceWpRadius;
Value<float> unknown2;
Value<float> unknown3;
Value<float> alignAngVel;
Value<float> unknown4;
Value<float> unknown5;
Value<float> unknown6;
Value<float> unknown7;
Value<atUint32> unknown8;
Value<atUint32> unknown9;
Value<atUint32> unknown10;
Value<float> playerObstructionMinDist;
Value<float> haltDelay;
Value<float> forwardMoveWeight;
Value<atUint32> haltSfx;
Value<atUint32> getUpSfx;
Value<atUint32> crouchSfx;
void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const {
actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
......
......@@ -14,14 +14,14 @@ struct IceZoomer : IScriptObject {
Value<atVec3f> scale;
PatternedInfo patternedInfo;
ActorParameters actorParameters;
Value<float> unknown1;
Value<float> advanceWpRadius;
Value<float> unknown2;
Value<float> unknown3;
Value<float> alignAngleVel;
Value<float> unknown4;
Value<float> unknown5;
Value<float> unknown6;
Value<atUint32> unknown7;
Value<atUint32> unknown8;
Value<float> playerObstructionMinDist;
Value<float> moveForwardWeight;
UniqueID32 modelRes;
UniqueID32 skinRes;
DamageVulnerability damageVulnerabilty;
Value<float> unknown9;
......@@ -37,6 +37,8 @@ struct IceZoomer : IScriptObject {
void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut, std::vector<hecl::ProjectPath>& lazyOut) const {
patternedInfo.depIDs(pathsOut);
actorParameters.depIDs(pathsOut, lazyOut);
g_curSpec->flattenDependencies(modelRes, pathsOut);
g_curSpec->flattenDependencies(skinRes, pathsOut);
}
void gatherScans(std::vector<Scan>& scansOut) const { actorParameters.scanIDs(scansOut); }
......
......@@ -15,11 +15,11 @@ struct MetareeAlpha : IScriptObject {
PatternedInfo patternedInfo;
ActorParameters actorParameters;
DamageInfo damageInfo;
Value<float> unknown1;
Value<atVec3f> unknown2;
Value<float> unknown3;
Value<float> unknown4;
Value<float> unknown5;
Value<float> dropHeight;
Value<atVec3f> offset;
Value<float> attackSpeed;
Value<float> delay;
Value<float> unknown5; // Appears to be unused
void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const {
actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
......
......@@ -11,8 +11,8 @@ struct PlayerHint : IScriptObject {
String<-1> name;
Value<atVec3f> location;
Value<atVec3f> orientation;
Value<bool> unknown1;
Value<bool> active;
PlayerHintParameters playerHintParameters;
Value<atUint32> unknown2;
Value<atUint32> priority;
};
} // namespace DataSpec::DNAMP1
......@@ -9,11 +9,11 @@ struct PlayerStateChange : IScriptObject {
AT_DECL_DNA_YAML
AT_DECL_DNAV
String<-1> name;
Value<bool> unknown;
Value<bool> active;
Value<atUint32> item;
Value<atUint32> unknown2;
Value<atUint32> unknown3;
Value<atUint32> unknown4;
Value<atUint32> unknown5;
Value<atUint32> itemCount;
Value<atUint32> itemCapacity;
Value<atUint32> control;
Value<atUint32> controlCommandOption;
};
} // namespace DataSpec::DNAMP1
......@@ -11,9 +11,9 @@ struct PointOfInterest : IScriptObject {
String<-1> name;
Value<atVec3f> location;
Value<atVec3f> orientation;
Value<bool> unknown1;
Value<bool> active;
ScannableParameters scannableParameters;
Value<float> unknown2;
Value<float> pointSize;
void nameIDs(PAKRouter<PAKBridge>& pakRouter) const { scannableParameters.nameIDs(pakRouter, name + "_scanp"); }
......
......@@ -11,6 +11,6 @@ struct Repulsor : IScriptObject {
String<-1> name;
Value<atVec3f> location;
Value<bool> active;
Value<float> unknown;
Value<float> radius;
};
} // namespace DataSpec::DNAMP1
......@@ -10,7 +10,7 @@ struct Ripple : IScriptObject {
AT_DECL_DNAV
String<-1> name;
Value<atVec3f> location;
Value<bool> unknown1;
Value<float> unknown2;
Value<bool> active;
Value<float> mag;
};
} // namespace DataSpec::DNAMP1
......@@ -14,11 +14,11 @@ struct SpankWeed : IScriptObject {
Value<atVec3f> scale;
PatternedInfo patternedInfo;
ActorParameters actorParameters;
Value<bool> unknown1;
Value<float> unknown2;
Value<float> unknown3;
Value<float> unknown4;
Value<float> unknown5;
Value<bool> unused;
Value<float> maxDetectionRange;
Value<float> maxHearingrange;
Value<float> maxSightRange;
Value<float> hideTime;
void addCMDLRigPairs(PAKRouter<PAKBridge>& pakRouter, CharacterAssociations<UniqueID32>& charAssoc) const {
actorParameters.addCMDLRigPairs(pakRouter, charAssoc, patternedInfo.animationParameters);
......
......@@ -31,7 +31,7 @@ struct SpawnPoint : IScriptObject {
Value<atUint32> combatVisor;
Value<atUint32> boostBall;
Value<atUint32> spiderBall;
Value<atUint32> powerSuit; // verification needed
Value<atUint32> powerSuit;
Value<atUint32> gravitySuit;
Value<atUint32> variaSuit;
Value<atUint32> phazonSuit;
......
......@@ -11,7 +11,7 @@ struct SpiderBallWaypoint : IScriptObject {
String<-1> name;
Value<atVec3f> location;
Value<atVec3f> orientation;
Value<bool> unknown1;
Value<bool> active;
Value<atUint32> unknown2;
};
} // namespace DataSpec::DNAMP1
......@@ -9,8 +9,8 @@ struct Switch : IScriptObject {
AT_DECL_DNA_YAML
AT_DECL_DNAV
String<-1> name;
Value<bool> unknown1;
Value<bool> unknown2;
Value<bool> unknown3;
Value<bool> active;
Value<bool> opened;
Value<bool> closeOnOpened;
};
} // namespace DataSpec::DNAMP1
......@@ -6,26 +6,26 @@ template <class Op>
void WorldTeleporter::Enumerate(typename Op::StreamT& s) {
IScriptObject::Enumerate<Op>(s);
Do<Op>({"name"}, name, s);
Do<Op>({"unknown1"}, unknown1, s);
Do<Op>({"active"}, active, s);
Do<Op>({"mlvl"}, mlvl, s);
Do<Op>({"mrea"}, mrea, s);
Do<Op>({"animationParameters"}, animationParameters, s);
Do<Op>({"unknown2"}, unknown2, s);
Do<Op>({"model1"}, model1, s);
Do<Op>({"unknown3"}, unknown3, s);
Do<Op>({"model2"}, model2, s);
Do<Op>({"unknown4"}, unknown4, s);
Do<Op>({"unknown5"}, unknown5, s);
Do<Op>({"soundID"}, soundID, s);
Do<Op>({"unknown6"}, unknown6, s);
Do<Op>({"unknown7"}, unknown7, s);
Do<Op>({"unknown8"}, unknown8, s);
Do<Op>({"playerScale"}, playerScale, s);
Do<Op>({"platformModel"}, platformModel, s);
Do<Op>({"platformScale"}, platformScale, s);
Do<Op>({"blackgroundModel"}, backgroundModel, s);
Do<Op>({"backgroundScale"}, backgroundScale, s);
Do<Op>({"upElevator"}, upElevator, s);
Do<Op>({"elevatorSound"}, elevatorSound, s);
Do<Op>({"volume"}, volume, s);
Do<Op>({"panning"}, panning, s);
Do<Op>({"showText"}, showText, s);
Do<Op>({"font"}, font, s);
Do<Op>({"strg"}, strg, s);
Do<Op>({"unknown9"}, unknown9, s);
Do<Op>({"unknown10"}, unknown10, s);
Do<Op>({"unknown11"}, unknown11, s);
Do<Op>({"unknown12"}, unknown12, s);
Do<Op>({"fadeWhite"}, fadeWhite, s);
Do<Op>({"charFadeInTime"}, charFadeInTime, s);
Do<Op>({"charsPerSecond"}, charFadeInTime, s);
Do<Op>({"showDelay"}, showDelay, s);
if (propertyCount == 26) {
Do<Op>({"audioStream"}, audioStream, s);
......
......@@ -10,26 +10,26 @@ struct WorldTeleporter : IScriptObject {
AT_DECL_EXPLICIT_DNA_YAML
AT_DECL_DNAV
String<-1> name;
Value<bool> unknown1;
Value<bool> active;
UniqueID32 mlvl;
UniqueID32 mrea;
AnimationParameters animationParameters;
Value<atVec3f> unknown2;
UniqueID32 model1;
Value<atVec3f> unknown3;
UniqueID32 model2;
Value<atVec3f> unknown4;
Value<bool> unknown5;
Value<atUint32> soundID; // needs verifcation
Value<atUint32> unknown6;
Value<atUint32> unknown7;
Value<bool> unknown8;
Value<atVec3f> playerScale;
UniqueID32 platformModel;
Value<atVec3f> platformScale;
UniqueID32 backgroundModel;
Value<atVec3f> backgroundScale;
Value<bool> upElevator;
Value<atUint32> elevatorSound; // needs verifcation
Value<atUint32> volume;
Value<atUint32> panning;
Value<bool> showText;
UniqueID32 font;
UniqueID32 strg;
Value<bool> unknown9;
Value<float> unknown10;
Value<float> unknown11;
Value<float> unknown12;
Value<bool> fadeWhite;
Value<float> charFadeInTime;
Value<float> charsPerSecond;
Value<float> showDelay;
/* Trilogy additions (property count 26) */
String<-1> audioStream;
......@@ -39,12 +39,12 @@ struct WorldTeleporter : IScriptObject {
Value<float> unknown16;
void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
if (model1) {
PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model1);
if (platformModel) {
PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(platformModel);
ent->name = name + "_model1";
}
if (model2) {
PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(model2);
if (backgroundModel) {
PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(backgroundModel);
ent->name = name + "_model2";
}
if (strg) {
......@@ -54,8 +54,8 @@ struct WorldTeleporter : IScriptObject {
}
void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut, std::vector<hecl::ProjectPath>& lazyOut) const {
g_curSpec->flattenDependencies(model1, pathsOut);
g_curSpec->flattenDependencies(model2, pathsOut);
g_curSpec->flattenDependencies(platformModel, pathsOut);
g_curSpec->flattenDependencies(backgroundModel, pathsOut);
g_curSpec->flattenDependencies(strg, pathsOut);
}
};
......
......@@ -51,7 +51,7 @@ PROJECT_BRIEF =
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
# the logo to the output directory.
PROJECT_LOGO = /home/antidote/Projects/urde/Editor/platforms/freedesktop/128x128/apps/urde.png
PROJECT_LOGO = ./Editor/platforms/freedesktop/128x128/apps/urde.png
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
# into which the generated documentation will be written. If a relative path is
......
......@@ -171,7 +171,7 @@ bool CFireFlea::CheckNearWater(const CStateManager& mgr, const zeus::CVector3f&
mgr.BuildNearList(nearList, GetTranslation(), dir, 2.f, CMaterialFilter::skPassEverything, nullptr);
for (TUniqueId id : nearList) {
if (TCastToConstPtr<CScriptWater> water = mgr.GetObjectById(id))
if (TCastToConstPtr<CScriptWater>(mgr.GetObjectById(id)))
return true;
}
......
......@@ -10,15 +10,16 @@ namespace urde::MP1 {
CFlickerBat::CFlickerBat(TUniqueId uid, std::string_view name, CPatterned::EFlavorType flavor, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo,
EColliderType colType, bool b1, const CActorParameters& actParms, bool b2)
EColliderType colType, bool startsHidden, const CActorParameters& actParms,
bool enableLineOfSight)
: CPatterned(ECharacter::FlickerBat, uid, name, flavor, info, xf, std::move(mData), pInfo, EMovementType::Flyer,
colType, EBodyType::Pitchable, actParms, EKnockBackVariant::Small)
, x574_state(EFlickerBatState(b1))
, x574_state(EFlickerBatState(startsHidden))
, x580_24_wasInXray(false)
, x580_25_heardShot(false)
, x580_26_inLOS(false)
, x580_27_enableLOSCheck(b2) {
SetupPlayerCollision(b1);
, x580_27_enableLOSCheck(enableLineOfSight) {
SetupPlayerCollision(startsHidden);
x3d8_xDamageThreshold = 0.f;
x402_27_noXrayModel = false;
}
......
......@@ -30,5 +30,6 @@ public:
void Think(float, CStateManager&);
void UpdateEntity(TUniqueId, CStateManager&);
bool IsPassive() const { return x44_25_isPassive; }
void SetIsPassive(bool b) { x44_25_isPassive = b; }
};
} // namespace urde
......@@ -6,10 +6,10 @@
namespace urde {
CScriptAiJumpPoint::CScriptAiJumpPoint(TUniqueId uid, std::string_view name, const CEntityInfo& info,
zeus::CTransform& xf, bool active, float f1)
zeus::CTransform& xf, bool active, float apex)
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(EMaterialTypes::NoStepLogic),
CActorParameters::None(), kInvalidUniqueId)
, xe8_apex(f1)
, xe8_apex(apex)
, xec_touchBounds(xf.origin, xf.origin) {}
void CScriptAiJumpPoint::Accept(IVisitor& visitor) { visitor.Visit(this); }
......
......@@ -12,13 +12,13 @@ const zeus::CVector3f CScriptCameraPitchVolume::skScaleFactor = zeus::CVector3f(
CScriptCameraPitchVolume::CScriptCameraPitchVolume(TUniqueId uid, bool active, std::string_view name,
const CEntityInfo& info, const zeus::CVector3f& scale,
const zeus::CTransform& xf, const zeus::CRelAngle& r1,
const zeus::CRelAngle& r2, float maxInterpDistance)
const zeus::CTransform& xf, const zeus::CRelAngle& upPitch,
const zeus::CRelAngle& downPitch, float maxInterpDistance)
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(EMaterialTypes::Trigger),
CActorParameters::None(), kInvalidUniqueId)
, xe8_obbox(xf, scale * skScaleFactor)
, x124_upPitch(r1)
, x128_downPitch(r2)
, x124_upPitch(upPitch)
, x128_downPitch(downPitch)
, x12c_scale(scale * skScaleFactor)
, x138_maxInterpDistance(maxInterpDistance) {}
......
This diff is collapsed.
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