From 729a6bac7ccde3538c13b9c7ab2f87b4db21c2e9 Mon Sep 17 00:00:00 2001 From: Nicholas Johnson Date: Thu, 14 Aug 2025 18:50:13 -0400 Subject: [PATCH] Renamed Assets to XAssets. --- libs/assets/comprimarylight.cpp | 208 ----------------- libs/assets/mapent.cpp | 1 - libs/assets/mapent.h | 11 - libs/assets/soundalias.cpp | 1 - libs/assets/soundalias.h | 103 --------- libs/assets/soundcurve.cpp | 1 - libs/assets/soundcurve.h | 11 - libs/assets/xaudioxmaloopregion.cpp | 21 -- libs/assets/xaudioxmaloopregion.h | 23 -- libs/assets/xmapents.cpp | 7 - libs/assets/xmapents.h | 15 -- libs/libs.pro | 2 +- .../360/assets_cod10_360.cpp | 0 .../360/assets_cod10_360.h | 0 .../360/assets_cod11_360.cpp | 0 .../360/assets_cod11_360.h | 0 .../360/assets_cod12_360.cpp | 0 .../360/assets_cod12_360.h | 0 .../360/assets_cod2_360.cpp | 0 .../{assets => xassets}/360/assets_cod2_360.h | 0 .../360/assets_cod4_360.cpp | 0 .../{assets => xassets}/360/assets_cod4_360.h | 0 .../360/assets_cod5_360.cpp | 0 .../{assets => xassets}/360/assets_cod5_360.h | 0 .../360/assets_cod6_360.cpp | 0 .../{assets => xassets}/360/assets_cod6_360.h | 0 .../360/assets_cod7_360.cpp | 0 .../{assets => xassets}/360/assets_cod7_360.h | 0 .../360/assets_cod8_360.cpp | 0 .../{assets => xassets}/360/assets_cod8_360.h | 0 .../360/assets_cod9_360.cpp | 0 .../{assets => xassets}/360/assets_cod9_360.h | 0 .../PC/assets_cod10_pc.cpp | 0 libs/{assets => xassets}/PC/assets_cod10_pc.h | 0 .../PC/assets_cod11_pc.cpp | 0 libs/{assets => xassets}/PC/assets_cod11_pc.h | 0 .../PC/assets_cod12_pc.cpp | 0 libs/{assets => xassets}/PC/assets_cod12_pc.h | 0 .../{assets => xassets}/PC/assets_cod4_pc.cpp | 0 libs/{assets => xassets}/PC/assets_cod4_pc.h | 0 .../{assets => xassets}/PC/assets_cod5_pc.cpp | 0 libs/{assets => xassets}/PC/assets_cod5_pc.h | 0 .../{assets => xassets}/PC/assets_cod6_pc.cpp | 0 libs/{assets => xassets}/PC/assets_cod6_pc.h | 0 .../{assets => xassets}/PC/assets_cod7_pc.cpp | 0 libs/{assets => xassets}/PC/assets_cod7_pc.h | 0 .../{assets => xassets}/PC/assets_cod8_pc.cpp | 0 libs/{assets => xassets}/PC/assets_cod8_pc.h | 0 .../{assets => xassets}/PC/assets_cod9_pc.cpp | 0 libs/{assets => xassets}/PC/assets_cod9_pc.h | 0 .../PS3/assets_cod10_ps3.cpp | 0 .../PS3/assets_cod10_ps3.h | 0 .../PS3/assets_cod11_ps3.cpp | 0 .../PS3/assets_cod11_ps3.h | 0 .../PS3/assets_cod12_ps3.cpp | 0 .../PS3/assets_cod12_ps3.h | 0 .../PS3/assets_cod4_ps3.cpp | 0 .../{assets => xassets}/PS3/assets_cod4_ps3.h | 0 .../PS3/assets_cod5_ps3.cpp | 0 .../{assets => xassets}/PS3/assets_cod5_ps3.h | 0 .../PS3/assets_cod6_ps3.cpp | 0 .../{assets => xassets}/PS3/assets_cod6_ps3.h | 0 .../PS3/assets_cod7_ps3.cpp | 0 .../{assets => xassets}/PS3/assets_cod7_ps3.h | 0 .../PS3/assets_cod8_ps3.cpp | 0 .../{assets => xassets}/PS3/assets_cod8_ps3.h | 0 .../PS3/assets_cod9_ps3.cpp | 0 .../{assets => xassets}/PS3/assets_cod9_ps3.h | 0 .../Wii/assets_cod4_wii.cpp | 0 .../{assets => xassets}/Wii/assets_cod4_wii.h | 0 .../Wii/assets_cod7_wii.cpp | 0 .../{assets => xassets}/Wii/assets_cod7_wii.h | 0 .../Wii/assets_cod8_wii.cpp | 0 .../{assets => xassets}/Wii/assets_cod8_wii.h | 0 .../WiiU/assets_cod10_wiiu.cpp | 0 .../WiiU/assets_cod10_wiiu.h | 0 .../WiiU/assets_cod9_wiiu.cpp | 0 .../WiiU/assets_cod9_wiiu.h | 0 libs/{assets => xassets}/animparts.cpp | 0 libs/{assets => xassets}/animparts.h | 0 libs/{assets => xassets}/assetlist.cpp | 0 libs/{assets => xassets}/assetlist.h | 0 libs/{assets => xassets}/assetmap.h | 2 +- libs/{assets => xassets}/assets.cpp | 10 +- libs/{assets => xassets}/assets.h | 8 +- libs/{assets => xassets}/clipmap.cpp | 0 libs/{assets => xassets}/clipmap.h | 0 libs/{assets => xassets}/d3dresource.cpp | 0 libs/{assets => xassets}/d3dresource.h | 0 libs/{assets => xassets}/effectdef.cpp | 0 libs/{assets => xassets}/effectdef.h | 0 libs/{assets => xassets}/effecttable.cpp | 0 libs/{assets => xassets}/effecttable.h | 0 libs/{assets => xassets}/file.cpp | 0 libs/{assets => xassets}/file.h | 0 libs/{assets => xassets}/font.cpp | 0 libs/{assets => xassets}/font.h | 0 libs/{assets => xassets}/gameworld.cpp | 0 libs/{assets => xassets}/gameworld.h | 0 libs/{assets => xassets}/gfximage.cpp | 0 libs/{assets => xassets}/gfximage.h | 0 libs/{assets => xassets}/gfxlightdef.cpp | 0 libs/{assets => xassets}/gfxlightdef.h | 0 libs/{assets => xassets}/gfxworld.cpp | 0 libs/{assets => xassets}/gfxworld.h | 0 libs/{assets => xassets}/loadedsound.cpp | 0 libs/{assets => xassets}/loadedsound.h | 0 libs/{assets => xassets}/material.cpp | 0 libs/{assets => xassets}/material.h | 0 .../materialpixelshader.cpp | 0 .../{assets => xassets}/materialpixelshader.h | 0 libs/{assets => xassets}/materialtechset.cpp | 0 libs/{assets => xassets}/materialtechset.h | 0 libs/{assets => xassets}/menudef.cpp | 0 libs/{assets => xassets}/menudef.h | 0 libs/{assets => xassets}/menulist.cpp | 0 libs/{assets => xassets}/menulist.h | 0 libs/{assets => xassets}/scriptstringlist.cpp | 0 libs/{assets => xassets}/scriptstringlist.h | 0 libs/{assets => xassets}/weapondef.cpp | 0 libs/{assets => xassets}/weapondef.h | 0 libs/{assets => xassets}/xasset.cpp | 0 libs/{assets => xassets}/xasset.h | 0 .../assets.pro => xassets/xassets.pro} | 0 libs/{assets => xassets}/xaudioformatinfo.cpp | 0 libs/{assets => xassets}/xaudioformatinfo.h | 0 .../xaudiopacketaligned.cpp | 0 .../{assets => xassets}/xaudiopacketaligned.h | 0 .../xaudioreverbsettings.cpp | 0 .../xaudioreverbsettings.h | 0 libs/{assets => xassets}/xaudioseektable.cpp | 0 libs/{assets => xassets}/xaudioseektable.h | 0 libs/{assets => xassets}/xaudiosound.cpp | 0 libs/{assets => xassets}/xaudiosound.h | 0 .../xaudiosourceformat.cpp | 0 libs/{assets => xassets}/xaudiosourceformat.h | 0 libs/{assets => xassets}/xaudiostreaminfo.cpp | 0 libs/{assets => xassets}/xaudiostreaminfo.h | 0 .../{assets => xassets}/xaudioxmadatainfo.cpp | 0 libs/{assets => xassets}/xaudioxmadatainfo.h | 0 libs/{assets => xassets}/xaudioxmaformat.cpp | 0 libs/{assets => xassets}/xaudioxmaformat.h | 0 libs/xassets/xaudioxmaloopregion.cpp | 21 ++ libs/xassets/xaudioxmaloopregion.h | 22 ++ libs/xassets/xcomprimarylight.cpp | 213 ++++++++++++++++++ .../xcomprimarylight.h} | 19 +- .../comworld.cpp => xassets/xcomworld.cpp} | 34 ++- .../comworld.h => xassets/xcomworld.h} | 20 +- .../xeditfielddefinition.cpp | 0 .../xeditfielddefinition.h | 0 libs/{assets => xassets}/xloadedsound.cpp | 0 libs/{assets => xassets}/xloadedsound.h | 0 libs/{assets => xassets}/xlocalizeentry.cpp | 0 libs/{assets => xassets}/xlocalizeentry.h | 0 libs/xassets/xmapents.cpp | 22 ++ libs/xassets/xmapents.h | 22 ++ libs/{assets => xassets}/xmodel.cpp | 0 libs/{assets => xassets}/xmodel.h | 0 libs/{assets => xassets}/xrawfile.cpp | 0 libs/{assets => xassets}/xrawfile.h | 0 libs/{assets => xassets}/xreverbsettings.cpp | 0 libs/{assets => xassets}/xreverbsettings.h | 0 libs/{assets => xassets}/xsoundalias.cpp | 0 libs/{assets => xassets}/xsoundalias.h | 0 libs/xassets/xsoundaliaslist.cpp | 16 ++ libs/xassets/xsoundaliaslist.h | 20 ++ libs/xassets/xsoundcurve.cpp | 16 ++ libs/xassets/xsoundcurve.h | 18 ++ .../xsounddriverglobals.cpp | 0 .../{assets => xassets}/xsounddriverglobals.h | 0 libs/{assets => xassets}/xsoundfile.cpp | 0 libs/{assets => xassets}/xsoundfile.h | 0 libs/{assets => xassets}/xsoundfileref.cpp | 0 libs/{assets => xassets}/xsoundfileref.h | 0 libs/{assets => xassets}/xstreamedsound.cpp | 0 libs/{assets => xassets}/xstreamedsound.h | 0 libs/{assets => xassets}/xstreamfileinfo.cpp | 0 libs/{assets => xassets}/xstreamfileinfo.h | 0 libs/{assets => xassets}/xstreamfilename.cpp | 0 libs/{assets => xassets}/xstreamfilename.h | 0 .../xstreamfilenamepacked.cpp | 0 .../xstreamfilenamepacked.h | 0 .../xstreamfilenameraw.cpp | 0 libs/{assets => xassets}/xstreamfilenameraw.h | 0 libs/{assets => xassets}/xstring.cpp | 0 libs/{assets => xassets}/xstring.h | 0 libs/{assets => xassets}/xstringtable.cpp | 0 libs/{assets => xassets}/xstringtable.h | 0 188 files changed, 415 insertions(+), 452 deletions(-) delete mode 100644 libs/assets/comprimarylight.cpp delete mode 100644 libs/assets/mapent.cpp delete mode 100644 libs/assets/mapent.h delete mode 100644 libs/assets/soundalias.cpp delete mode 100644 libs/assets/soundalias.h delete mode 100644 libs/assets/soundcurve.cpp delete mode 100644 libs/assets/soundcurve.h delete mode 100644 libs/assets/xaudioxmaloopregion.cpp delete mode 100644 libs/assets/xaudioxmaloopregion.h delete mode 100644 libs/assets/xmapents.cpp delete mode 100644 libs/assets/xmapents.h rename libs/{assets => xassets}/360/assets_cod10_360.cpp (100%) rename libs/{assets => xassets}/360/assets_cod10_360.h (100%) rename libs/{assets => xassets}/360/assets_cod11_360.cpp (100%) rename libs/{assets => xassets}/360/assets_cod11_360.h (100%) rename libs/{assets => xassets}/360/assets_cod12_360.cpp (100%) rename libs/{assets => xassets}/360/assets_cod12_360.h (100%) rename libs/{assets => xassets}/360/assets_cod2_360.cpp (100%) rename libs/{assets => xassets}/360/assets_cod2_360.h (100%) rename libs/{assets => xassets}/360/assets_cod4_360.cpp (100%) rename libs/{assets => xassets}/360/assets_cod4_360.h (100%) rename libs/{assets => xassets}/360/assets_cod5_360.cpp (100%) rename libs/{assets => xassets}/360/assets_cod5_360.h (100%) rename libs/{assets => xassets}/360/assets_cod6_360.cpp (100%) rename libs/{assets => xassets}/360/assets_cod6_360.h (100%) rename libs/{assets => xassets}/360/assets_cod7_360.cpp (100%) rename libs/{assets => xassets}/360/assets_cod7_360.h (100%) rename libs/{assets => xassets}/360/assets_cod8_360.cpp (100%) rename libs/{assets => xassets}/360/assets_cod8_360.h (100%) rename libs/{assets => xassets}/360/assets_cod9_360.cpp (100%) rename libs/{assets => xassets}/360/assets_cod9_360.h (100%) rename libs/{assets => xassets}/PC/assets_cod10_pc.cpp (100%) rename libs/{assets => xassets}/PC/assets_cod10_pc.h (100%) rename libs/{assets => xassets}/PC/assets_cod11_pc.cpp (100%) rename libs/{assets => xassets}/PC/assets_cod11_pc.h (100%) rename libs/{assets => xassets}/PC/assets_cod12_pc.cpp (100%) rename libs/{assets => xassets}/PC/assets_cod12_pc.h (100%) rename libs/{assets => xassets}/PC/assets_cod4_pc.cpp (100%) rename libs/{assets => xassets}/PC/assets_cod4_pc.h (100%) rename libs/{assets => xassets}/PC/assets_cod5_pc.cpp (100%) rename libs/{assets => xassets}/PC/assets_cod5_pc.h (100%) rename libs/{assets => xassets}/PC/assets_cod6_pc.cpp (100%) rename libs/{assets => xassets}/PC/assets_cod6_pc.h (100%) rename libs/{assets => xassets}/PC/assets_cod7_pc.cpp (100%) rename libs/{assets => xassets}/PC/assets_cod7_pc.h (100%) rename libs/{assets => xassets}/PC/assets_cod8_pc.cpp (100%) rename libs/{assets => xassets}/PC/assets_cod8_pc.h (100%) rename libs/{assets => xassets}/PC/assets_cod9_pc.cpp (100%) rename libs/{assets => xassets}/PC/assets_cod9_pc.h (100%) rename libs/{assets => xassets}/PS3/assets_cod10_ps3.cpp (100%) rename libs/{assets => xassets}/PS3/assets_cod10_ps3.h (100%) rename libs/{assets => xassets}/PS3/assets_cod11_ps3.cpp (100%) rename libs/{assets => xassets}/PS3/assets_cod11_ps3.h (100%) rename libs/{assets => xassets}/PS3/assets_cod12_ps3.cpp (100%) rename libs/{assets => xassets}/PS3/assets_cod12_ps3.h (100%) rename libs/{assets => xassets}/PS3/assets_cod4_ps3.cpp (100%) rename libs/{assets => xassets}/PS3/assets_cod4_ps3.h (100%) rename libs/{assets => xassets}/PS3/assets_cod5_ps3.cpp (100%) rename libs/{assets => xassets}/PS3/assets_cod5_ps3.h (100%) rename libs/{assets => xassets}/PS3/assets_cod6_ps3.cpp (100%) rename libs/{assets => xassets}/PS3/assets_cod6_ps3.h (100%) rename libs/{assets => xassets}/PS3/assets_cod7_ps3.cpp (100%) rename libs/{assets => xassets}/PS3/assets_cod7_ps3.h (100%) rename libs/{assets => xassets}/PS3/assets_cod8_ps3.cpp (100%) rename libs/{assets => xassets}/PS3/assets_cod8_ps3.h (100%) rename libs/{assets => xassets}/PS3/assets_cod9_ps3.cpp (100%) rename libs/{assets => xassets}/PS3/assets_cod9_ps3.h (100%) rename libs/{assets => xassets}/Wii/assets_cod4_wii.cpp (100%) rename libs/{assets => xassets}/Wii/assets_cod4_wii.h (100%) rename libs/{assets => xassets}/Wii/assets_cod7_wii.cpp (100%) rename libs/{assets => xassets}/Wii/assets_cod7_wii.h (100%) rename libs/{assets => xassets}/Wii/assets_cod8_wii.cpp (100%) rename libs/{assets => xassets}/Wii/assets_cod8_wii.h (100%) rename libs/{assets => xassets}/WiiU/assets_cod10_wiiu.cpp (100%) rename libs/{assets => xassets}/WiiU/assets_cod10_wiiu.h (100%) rename libs/{assets => xassets}/WiiU/assets_cod9_wiiu.cpp (100%) rename libs/{assets => xassets}/WiiU/assets_cod9_wiiu.h (100%) rename libs/{assets => xassets}/animparts.cpp (100%) rename libs/{assets => xassets}/animparts.h (100%) rename libs/{assets => xassets}/assetlist.cpp (100%) rename libs/{assets => xassets}/assetlist.h (100%) rename libs/{assets => xassets}/assetmap.h (98%) rename libs/{assets => xassets}/assets.cpp (99%) rename libs/{assets => xassets}/assets.h (99%) rename libs/{assets => xassets}/clipmap.cpp (100%) rename libs/{assets => xassets}/clipmap.h (100%) rename libs/{assets => xassets}/d3dresource.cpp (100%) rename libs/{assets => xassets}/d3dresource.h (100%) rename libs/{assets => xassets}/effectdef.cpp (100%) rename libs/{assets => xassets}/effectdef.h (100%) rename libs/{assets => xassets}/effecttable.cpp (100%) rename libs/{assets => xassets}/effecttable.h (100%) rename libs/{assets => xassets}/file.cpp (100%) rename libs/{assets => xassets}/file.h (100%) rename libs/{assets => xassets}/font.cpp (100%) rename libs/{assets => xassets}/font.h (100%) rename libs/{assets => xassets}/gameworld.cpp (100%) rename libs/{assets => xassets}/gameworld.h (100%) rename libs/{assets => xassets}/gfximage.cpp (100%) rename libs/{assets => xassets}/gfximage.h (100%) rename libs/{assets => xassets}/gfxlightdef.cpp (100%) rename libs/{assets => xassets}/gfxlightdef.h (100%) rename libs/{assets => xassets}/gfxworld.cpp (100%) rename libs/{assets => xassets}/gfxworld.h (100%) rename libs/{assets => xassets}/loadedsound.cpp (100%) rename libs/{assets => xassets}/loadedsound.h (100%) rename libs/{assets => xassets}/material.cpp (100%) rename libs/{assets => xassets}/material.h (100%) rename libs/{assets => xassets}/materialpixelshader.cpp (100%) rename libs/{assets => xassets}/materialpixelshader.h (100%) rename libs/{assets => xassets}/materialtechset.cpp (100%) rename libs/{assets => xassets}/materialtechset.h (100%) rename libs/{assets => xassets}/menudef.cpp (100%) rename libs/{assets => xassets}/menudef.h (100%) rename libs/{assets => xassets}/menulist.cpp (100%) rename libs/{assets => xassets}/menulist.h (100%) rename libs/{assets => xassets}/scriptstringlist.cpp (100%) rename libs/{assets => xassets}/scriptstringlist.h (100%) rename libs/{assets => xassets}/weapondef.cpp (100%) rename libs/{assets => xassets}/weapondef.h (100%) rename libs/{assets => xassets}/xasset.cpp (100%) rename libs/{assets => xassets}/xasset.h (100%) rename libs/{assets/assets.pro => xassets/xassets.pro} (100%) rename libs/{assets => xassets}/xaudioformatinfo.cpp (100%) rename libs/{assets => xassets}/xaudioformatinfo.h (100%) rename libs/{assets => xassets}/xaudiopacketaligned.cpp (100%) rename libs/{assets => xassets}/xaudiopacketaligned.h (100%) rename libs/{assets => xassets}/xaudioreverbsettings.cpp (100%) rename libs/{assets => xassets}/xaudioreverbsettings.h (100%) rename libs/{assets => xassets}/xaudioseektable.cpp (100%) rename libs/{assets => xassets}/xaudioseektable.h (100%) rename libs/{assets => xassets}/xaudiosound.cpp (100%) rename libs/{assets => xassets}/xaudiosound.h (100%) rename libs/{assets => xassets}/xaudiosourceformat.cpp (100%) rename libs/{assets => xassets}/xaudiosourceformat.h (100%) rename libs/{assets => xassets}/xaudiostreaminfo.cpp (100%) rename libs/{assets => xassets}/xaudiostreaminfo.h (100%) rename libs/{assets => xassets}/xaudioxmadatainfo.cpp (100%) rename libs/{assets => xassets}/xaudioxmadatainfo.h (100%) rename libs/{assets => xassets}/xaudioxmaformat.cpp (100%) rename libs/{assets => xassets}/xaudioxmaformat.h (100%) create mode 100644 libs/xassets/xaudioxmaloopregion.cpp create mode 100644 libs/xassets/xaudioxmaloopregion.h create mode 100644 libs/xassets/xcomprimarylight.cpp rename libs/{assets/comprimarylight.h => xassets/xcomprimarylight.h} (83%) rename libs/{assets/comworld.cpp => xassets/xcomworld.cpp} (53%) rename libs/{assets/comworld.h => xassets/xcomworld.h} (60%) rename libs/{assets => xassets}/xeditfielddefinition.cpp (100%) rename libs/{assets => xassets}/xeditfielddefinition.h (100%) rename libs/{assets => xassets}/xloadedsound.cpp (100%) rename libs/{assets => xassets}/xloadedsound.h (100%) rename libs/{assets => xassets}/xlocalizeentry.cpp (100%) rename libs/{assets => xassets}/xlocalizeentry.h (100%) create mode 100644 libs/xassets/xmapents.cpp create mode 100644 libs/xassets/xmapents.h rename libs/{assets => xassets}/xmodel.cpp (100%) rename libs/{assets => xassets}/xmodel.h (100%) rename libs/{assets => xassets}/xrawfile.cpp (100%) rename libs/{assets => xassets}/xrawfile.h (100%) rename libs/{assets => xassets}/xreverbsettings.cpp (100%) rename libs/{assets => xassets}/xreverbsettings.h (100%) rename libs/{assets => xassets}/xsoundalias.cpp (100%) rename libs/{assets => xassets}/xsoundalias.h (100%) create mode 100644 libs/xassets/xsoundaliaslist.cpp create mode 100644 libs/xassets/xsoundaliaslist.h create mode 100644 libs/xassets/xsoundcurve.cpp create mode 100644 libs/xassets/xsoundcurve.h rename libs/{assets => xassets}/xsounddriverglobals.cpp (100%) rename libs/{assets => xassets}/xsounddriverglobals.h (100%) rename libs/{assets => xassets}/xsoundfile.cpp (100%) rename libs/{assets => xassets}/xsoundfile.h (100%) rename libs/{assets => xassets}/xsoundfileref.cpp (100%) rename libs/{assets => xassets}/xsoundfileref.h (100%) rename libs/{assets => xassets}/xstreamedsound.cpp (100%) rename libs/{assets => xassets}/xstreamedsound.h (100%) rename libs/{assets => xassets}/xstreamfileinfo.cpp (100%) rename libs/{assets => xassets}/xstreamfileinfo.h (100%) rename libs/{assets => xassets}/xstreamfilename.cpp (100%) rename libs/{assets => xassets}/xstreamfilename.h (100%) rename libs/{assets => xassets}/xstreamfilenamepacked.cpp (100%) rename libs/{assets => xassets}/xstreamfilenamepacked.h (100%) rename libs/{assets => xassets}/xstreamfilenameraw.cpp (100%) rename libs/{assets => xassets}/xstreamfilenameraw.h (100%) rename libs/{assets => xassets}/xstring.cpp (100%) rename libs/{assets => xassets}/xstring.h (100%) rename libs/{assets => xassets}/xstringtable.cpp (100%) rename libs/{assets => xassets}/xstringtable.h (100%) diff --git a/libs/assets/comprimarylight.cpp b/libs/assets/comprimarylight.cpp deleted file mode 100644 index da46acb..0000000 --- a/libs/assets/comprimarylight.cpp +++ /dev/null @@ -1,208 +0,0 @@ -#include "comprimarylight.h" - -ComPrimaryLight::ComPrimaryLight(QObject *aParent) - : XAsset(aParent) - , mType(-1) - , mCanUseShadowMap(-1) - , mExponent(-1) - , mUnused(-1) - , mColor(0, 0, 0) - , mDir(0, 0, 0) - , mOrigin(0, 0, 0) - , mRadius(0.0) - , mCosHalfFovOuter(0.0) - , mCosHalfFovInner(0.0) - , mCosHalfFovExpanded(0.0) - , mRotationLimit(0.0) - , mTranslationLimit(0.0) - , mDefName(new XString(this)) -{ - -} - -void ComPrimaryLight::Clear() -{ - delete mDefName; -} - -ComPrimaryLightArray *ComPrimaryLight::ParseArray(QDataStream *aStream, int aCount) -{ - ComPrimaryLightArray* result = new ComPrimaryLightArray(); - - for (int i = 0; i < aCount; i++) - { - ComPrimaryLight* comPrimaryLight = new ComPrimaryLight(); - comPrimaryLight->ParseData(aStream); - - result->append(comPrimaryLight); - } - - return result; -} - -void ComPrimaryLight::ParseData(QDataStream *aStream) -{ - *aStream - >> mType - >> mCanUseShadowMap - >> mExponent - >> mUnused - >> mColor - >> mDir - >> mOrigin - >> mRadius - >> mCosHalfFovOuter - >> mCosHalfFovInner - >> mCosHalfFovExpanded - >> mRotationLimit - >> mTranslationLimit; - - mDefName->ParseData(aStream); -} - -quint8 ComPrimaryLight::GetType() const -{ - return mType; -} - -quint8 ComPrimaryLight::GetCanUseShadowMap() const -{ - return mCanUseShadowMap; -} - -quint8 ComPrimaryLight::GetExponent() const -{ - return mExponent; -} - -quint8 ComPrimaryLight::GetUnused() const -{ - return mUnused; -} - -QColor ComPrimaryLight::GetColor() const -{ - return mColor; -} - -QVector3D ComPrimaryLight::GetDir() const -{ - return mDir; -} - -QVector3D ComPrimaryLight::GetOrigin() const -{ - return mOrigin; -} - -float ComPrimaryLight::GetRadius() const -{ - return mRadius; -} - -float ComPrimaryLight::GetCosHalfFovOuter() const -{ - return mCosHalfFovOuter; -} - -float ComPrimaryLight::GetCosHalfFovInner() const -{ - return mCosHalfFovInner; -} - -float ComPrimaryLight::GetCosHalfFovExpanded() const -{ - return mCosHalfFovExpanded; -} - -float ComPrimaryLight::GetRotationLimit() const -{ - return mRotationLimit; -} - -float ComPrimaryLight::GetTranslationLimit() const -{ - return mTranslationLimit; -} - -XString* ComPrimaryLight::GetDefName() const -{ - return mDefName; -} - -void ComPrimaryLight::SetType(quint8 aType) -{ - mType = aType; -} - -void ComPrimaryLight::SetCanUseShadowMap(quint8 aCanUseShadowMap) -{ - mCanUseShadowMap = aCanUseShadowMap; -} - -void ComPrimaryLight::SetExponent(quint8 aExponent) -{ - mExponent = aExponent; -} - -void ComPrimaryLight::SetUnused(quint8 aUnused) -{ - mUnused = aUnused; -} - -void ComPrimaryLight::SetColor(const QColor aColor) -{ - mColor = aColor; -} - -void ComPrimaryLight::SetDir(const QVector3D aDir) -{ - mDir = aDir; -} - -void ComPrimaryLight::SetOrigin(const QVector3D aOrigin) -{ - mOrigin = aOrigin; -} - -void ComPrimaryLight::SetRadius(float aRadius) -{ - mRadius = aRadius; -} - -void ComPrimaryLight::SetCosHalfFovOuter(float aCosHalfFovOuter) -{ - mCosHalfFovOuter = aCosHalfFovOuter; -} - -void ComPrimaryLight::SetCosHalfFovInner(float aCosHalfFovInner) -{ - mCosHalfFovInner = aCosHalfFovInner; -} - -void ComPrimaryLight::SetCosHalfFovExpanded(float aCosHalfFovExpanded) -{ - mCosHalfFovExpanded = aCosHalfFovExpanded; -} - -void ComPrimaryLight::SetRotationLimit(float aRotationLimit) -{ - mRotationLimit = aRotationLimit; -} - -void ComPrimaryLight::SetTranslationLimit(float aTranslationLimit) -{ - mTranslationLimit = aTranslationLimit; -} - -void ComPrimaryLight::SetDefName(XString* aDefName) -{ - mDefName = aDefName; -} - -void ComPrimaryLight::SetDefName(const QString aDefName) -{ - if (mDefName != nullptr) { - mDefName->SetString(aDefName); - } -} diff --git a/libs/assets/mapent.cpp b/libs/assets/mapent.cpp deleted file mode 100644 index 985d8c6..0000000 --- a/libs/assets/mapent.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "mapent.h" diff --git a/libs/assets/mapent.h b/libs/assets/mapent.h deleted file mode 100644 index e180cd1..0000000 --- a/libs/assets/mapent.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef MAPENT_H -#define MAPENT_H - -struct MapEnts -{ - const char *name; - char *entityString; - int numEntityChars; -}; - -#endif // MAPENT_H diff --git a/libs/assets/soundalias.cpp b/libs/assets/soundalias.cpp deleted file mode 100644 index 8409712..0000000 --- a/libs/assets/soundalias.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "soundalias.h" diff --git a/libs/assets/soundalias.h b/libs/assets/soundalias.h deleted file mode 100644 index 55ee532..0000000 --- a/libs/assets/soundalias.h +++ /dev/null @@ -1,103 +0,0 @@ -#ifndef SOUNDALIAS_H -#define SOUNDALIAS_H - -#include "soundcurve.h" -#include "loadedsound.h" - -struct StreamFileNameRaw -{ - const char *dir; - const char *name; -}; - -struct StreamFileNamePacked -{ - unsigned int offset; - unsigned int length; -}; - -union StreamFileInfo -{ - StreamFileNameRaw raw; - StreamFileNamePacked packed; -}; - -struct StreamFileName -{ - unsigned int fileIndex; - StreamFileInfo info; -}; - -struct StreamedSound -{ - StreamFileName filename; -}; - -union SoundFileRef -{ - LoadedSound *loadSnd; - StreamedSound streamSnd; -}; - -struct SoundFile -{ - unsigned __int8 type; - unsigned __int8 exists; - SoundFileRef u; -}; - -struct XAUDIOCHANNELMAPENTRY -{ - unsigned __int8 InputChannel; - unsigned __int8 OutputChannel; - float Volume; -}; - -struct XAUDIOCHANNELMAP -{ - unsigned __int8 EntryCount; - XAUDIOCHANNELMAPENTRY *paEntries; -}; - -struct SpeakerMap -{ - bool isDefault; - const char *name; - XAUDIOCHANNELMAP channelMaps[2][2]; -}; - -struct snd_alias_t -{ - const char *aliasName; - const char *subtitle; - const char *secondaryAliasName; - const char *chainAliasName; - SoundFile *soundFile; - int sequence; - float volMin; - float volMax; - float pitchMin; - float pitchMax; - float distMin; - float distMax; - int flags; - float slavePercentage; - float probability; - float lfePercentage; - float centerPercentage; - int startDelay; - SoundCurve *volumeFalloffCurve; - float envelopMin; - float envelopMax; - float envelopPercentage; - SpeakerMap *speakerMap; -}; - -struct SoundAliasList -{ - const char *aliasName; - snd_alias_t *head; - int count; -}; - -#endif // SOUNDALIAS_H diff --git a/libs/assets/soundcurve.cpp b/libs/assets/soundcurve.cpp deleted file mode 100644 index 6d7db5c..0000000 --- a/libs/assets/soundcurve.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "soundcurve.h" diff --git a/libs/assets/soundcurve.h b/libs/assets/soundcurve.h deleted file mode 100644 index 58db677..0000000 --- a/libs/assets/soundcurve.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef SOUNDCURVE_H -#define SOUNDCURVE_H - -struct SoundCurve -{ - const char *filename; - int knotCount; - float knots[8][2]; -}; - -#endif // SOUNDCURVE_H diff --git a/libs/assets/xaudioxmaloopregion.cpp b/libs/assets/xaudioxmaloopregion.cpp deleted file mode 100644 index a8426d1..0000000 --- a/libs/assets/xaudioxmaloopregion.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "xsoundfile.h" - -XSoundFile::XSoundFile() -{ - -} - -XSoundFile::~XSoundFile() -{ - -} - -void XSoundFile::ParseData(QDataStream *aStream) -{ - -} - -void XSoundFile::Clear() -{ - -} diff --git a/libs/assets/xaudioxmaloopregion.h b/libs/assets/xaudioxmaloopregion.h deleted file mode 100644 index 5616abd..0000000 --- a/libs/assets/xaudioxmaloopregion.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef XSOUNDFILE_H -#define XSOUNDFILE_H - -#include "xasset.h" - -class XSoundFileRef; - -class XSoundFile : public XAsset -{ -public: - XSoundFile(); - ~XSoundFile(); - - virtual void ParseData(QDataStream* aStream) override; - virtual void Clear() override; - -private: - quint8 mType; - quint8 mExists; - XSoundFileRef* mRef; -}; - -#endif // XSOUNDFILE_H diff --git a/libs/assets/xmapents.cpp b/libs/assets/xmapents.cpp deleted file mode 100644 index 026fcc7..0000000 --- a/libs/assets/xmapents.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "xmapents.h" - -XMapEnts::XMapEnts() - : XAsset() -{ - -} diff --git a/libs/assets/xmapents.h b/libs/assets/xmapents.h deleted file mode 100644 index e894a1b..0000000 --- a/libs/assets/xmapents.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef XMAPENTS_H -#define XMAPENTS_H - -#include "xasset.h" - -class XMapEnts : public XAsset -{ -public: - XMapEnts(); - -private: - -}; - -#endif // XMAPENTS_H diff --git a/libs/libs.pro b/libs/libs.pro index af03ec5..011f76b 100644 --- a/libs/libs.pro +++ b/libs/libs.pro @@ -4,7 +4,7 @@ SUBDIRS += core \ compression \ encryption \ fastfile \ - assets \ + xassets \ zonefile \ ddsfile \ iwifile \ diff --git a/libs/assets/360/assets_cod10_360.cpp b/libs/xassets/360/assets_cod10_360.cpp similarity index 100% rename from libs/assets/360/assets_cod10_360.cpp rename to libs/xassets/360/assets_cod10_360.cpp diff --git a/libs/assets/360/assets_cod10_360.h b/libs/xassets/360/assets_cod10_360.h similarity index 100% rename from libs/assets/360/assets_cod10_360.h rename to libs/xassets/360/assets_cod10_360.h diff --git a/libs/assets/360/assets_cod11_360.cpp b/libs/xassets/360/assets_cod11_360.cpp similarity index 100% rename from libs/assets/360/assets_cod11_360.cpp rename to libs/xassets/360/assets_cod11_360.cpp diff --git a/libs/assets/360/assets_cod11_360.h b/libs/xassets/360/assets_cod11_360.h similarity index 100% rename from libs/assets/360/assets_cod11_360.h rename to libs/xassets/360/assets_cod11_360.h diff --git a/libs/assets/360/assets_cod12_360.cpp b/libs/xassets/360/assets_cod12_360.cpp similarity index 100% rename from libs/assets/360/assets_cod12_360.cpp rename to libs/xassets/360/assets_cod12_360.cpp diff --git a/libs/assets/360/assets_cod12_360.h b/libs/xassets/360/assets_cod12_360.h similarity index 100% rename from libs/assets/360/assets_cod12_360.h rename to libs/xassets/360/assets_cod12_360.h diff --git a/libs/assets/360/assets_cod2_360.cpp b/libs/xassets/360/assets_cod2_360.cpp similarity index 100% rename from libs/assets/360/assets_cod2_360.cpp rename to libs/xassets/360/assets_cod2_360.cpp diff --git a/libs/assets/360/assets_cod2_360.h b/libs/xassets/360/assets_cod2_360.h similarity index 100% rename from libs/assets/360/assets_cod2_360.h rename to libs/xassets/360/assets_cod2_360.h diff --git a/libs/assets/360/assets_cod4_360.cpp b/libs/xassets/360/assets_cod4_360.cpp similarity index 100% rename from libs/assets/360/assets_cod4_360.cpp rename to libs/xassets/360/assets_cod4_360.cpp diff --git a/libs/assets/360/assets_cod4_360.h b/libs/xassets/360/assets_cod4_360.h similarity index 100% rename from libs/assets/360/assets_cod4_360.h rename to libs/xassets/360/assets_cod4_360.h diff --git a/libs/assets/360/assets_cod5_360.cpp b/libs/xassets/360/assets_cod5_360.cpp similarity index 100% rename from libs/assets/360/assets_cod5_360.cpp rename to libs/xassets/360/assets_cod5_360.cpp diff --git a/libs/assets/360/assets_cod5_360.h b/libs/xassets/360/assets_cod5_360.h similarity index 100% rename from libs/assets/360/assets_cod5_360.h rename to libs/xassets/360/assets_cod5_360.h diff --git a/libs/assets/360/assets_cod6_360.cpp b/libs/xassets/360/assets_cod6_360.cpp similarity index 100% rename from libs/assets/360/assets_cod6_360.cpp rename to libs/xassets/360/assets_cod6_360.cpp diff --git a/libs/assets/360/assets_cod6_360.h b/libs/xassets/360/assets_cod6_360.h similarity index 100% rename from libs/assets/360/assets_cod6_360.h rename to libs/xassets/360/assets_cod6_360.h diff --git a/libs/assets/360/assets_cod7_360.cpp b/libs/xassets/360/assets_cod7_360.cpp similarity index 100% rename from libs/assets/360/assets_cod7_360.cpp rename to libs/xassets/360/assets_cod7_360.cpp diff --git a/libs/assets/360/assets_cod7_360.h b/libs/xassets/360/assets_cod7_360.h similarity index 100% rename from libs/assets/360/assets_cod7_360.h rename to libs/xassets/360/assets_cod7_360.h diff --git a/libs/assets/360/assets_cod8_360.cpp b/libs/xassets/360/assets_cod8_360.cpp similarity index 100% rename from libs/assets/360/assets_cod8_360.cpp rename to libs/xassets/360/assets_cod8_360.cpp diff --git a/libs/assets/360/assets_cod8_360.h b/libs/xassets/360/assets_cod8_360.h similarity index 100% rename from libs/assets/360/assets_cod8_360.h rename to libs/xassets/360/assets_cod8_360.h diff --git a/libs/assets/360/assets_cod9_360.cpp b/libs/xassets/360/assets_cod9_360.cpp similarity index 100% rename from libs/assets/360/assets_cod9_360.cpp rename to libs/xassets/360/assets_cod9_360.cpp diff --git a/libs/assets/360/assets_cod9_360.h b/libs/xassets/360/assets_cod9_360.h similarity index 100% rename from libs/assets/360/assets_cod9_360.h rename to libs/xassets/360/assets_cod9_360.h diff --git a/libs/assets/PC/assets_cod10_pc.cpp b/libs/xassets/PC/assets_cod10_pc.cpp similarity index 100% rename from libs/assets/PC/assets_cod10_pc.cpp rename to libs/xassets/PC/assets_cod10_pc.cpp diff --git a/libs/assets/PC/assets_cod10_pc.h b/libs/xassets/PC/assets_cod10_pc.h similarity index 100% rename from libs/assets/PC/assets_cod10_pc.h rename to libs/xassets/PC/assets_cod10_pc.h diff --git a/libs/assets/PC/assets_cod11_pc.cpp b/libs/xassets/PC/assets_cod11_pc.cpp similarity index 100% rename from libs/assets/PC/assets_cod11_pc.cpp rename to libs/xassets/PC/assets_cod11_pc.cpp diff --git a/libs/assets/PC/assets_cod11_pc.h b/libs/xassets/PC/assets_cod11_pc.h similarity index 100% rename from libs/assets/PC/assets_cod11_pc.h rename to libs/xassets/PC/assets_cod11_pc.h diff --git a/libs/assets/PC/assets_cod12_pc.cpp b/libs/xassets/PC/assets_cod12_pc.cpp similarity index 100% rename from libs/assets/PC/assets_cod12_pc.cpp rename to libs/xassets/PC/assets_cod12_pc.cpp diff --git a/libs/assets/PC/assets_cod12_pc.h b/libs/xassets/PC/assets_cod12_pc.h similarity index 100% rename from libs/assets/PC/assets_cod12_pc.h rename to libs/xassets/PC/assets_cod12_pc.h diff --git a/libs/assets/PC/assets_cod4_pc.cpp b/libs/xassets/PC/assets_cod4_pc.cpp similarity index 100% rename from libs/assets/PC/assets_cod4_pc.cpp rename to libs/xassets/PC/assets_cod4_pc.cpp diff --git a/libs/assets/PC/assets_cod4_pc.h b/libs/xassets/PC/assets_cod4_pc.h similarity index 100% rename from libs/assets/PC/assets_cod4_pc.h rename to libs/xassets/PC/assets_cod4_pc.h diff --git a/libs/assets/PC/assets_cod5_pc.cpp b/libs/xassets/PC/assets_cod5_pc.cpp similarity index 100% rename from libs/assets/PC/assets_cod5_pc.cpp rename to libs/xassets/PC/assets_cod5_pc.cpp diff --git a/libs/assets/PC/assets_cod5_pc.h b/libs/xassets/PC/assets_cod5_pc.h similarity index 100% rename from libs/assets/PC/assets_cod5_pc.h rename to libs/xassets/PC/assets_cod5_pc.h diff --git a/libs/assets/PC/assets_cod6_pc.cpp b/libs/xassets/PC/assets_cod6_pc.cpp similarity index 100% rename from libs/assets/PC/assets_cod6_pc.cpp rename to libs/xassets/PC/assets_cod6_pc.cpp diff --git a/libs/assets/PC/assets_cod6_pc.h b/libs/xassets/PC/assets_cod6_pc.h similarity index 100% rename from libs/assets/PC/assets_cod6_pc.h rename to libs/xassets/PC/assets_cod6_pc.h diff --git a/libs/assets/PC/assets_cod7_pc.cpp b/libs/xassets/PC/assets_cod7_pc.cpp similarity index 100% rename from libs/assets/PC/assets_cod7_pc.cpp rename to libs/xassets/PC/assets_cod7_pc.cpp diff --git a/libs/assets/PC/assets_cod7_pc.h b/libs/xassets/PC/assets_cod7_pc.h similarity index 100% rename from libs/assets/PC/assets_cod7_pc.h rename to libs/xassets/PC/assets_cod7_pc.h diff --git a/libs/assets/PC/assets_cod8_pc.cpp b/libs/xassets/PC/assets_cod8_pc.cpp similarity index 100% rename from libs/assets/PC/assets_cod8_pc.cpp rename to libs/xassets/PC/assets_cod8_pc.cpp diff --git a/libs/assets/PC/assets_cod8_pc.h b/libs/xassets/PC/assets_cod8_pc.h similarity index 100% rename from libs/assets/PC/assets_cod8_pc.h rename to libs/xassets/PC/assets_cod8_pc.h diff --git a/libs/assets/PC/assets_cod9_pc.cpp b/libs/xassets/PC/assets_cod9_pc.cpp similarity index 100% rename from libs/assets/PC/assets_cod9_pc.cpp rename to libs/xassets/PC/assets_cod9_pc.cpp diff --git a/libs/assets/PC/assets_cod9_pc.h b/libs/xassets/PC/assets_cod9_pc.h similarity index 100% rename from libs/assets/PC/assets_cod9_pc.h rename to libs/xassets/PC/assets_cod9_pc.h diff --git a/libs/assets/PS3/assets_cod10_ps3.cpp b/libs/xassets/PS3/assets_cod10_ps3.cpp similarity index 100% rename from libs/assets/PS3/assets_cod10_ps3.cpp rename to libs/xassets/PS3/assets_cod10_ps3.cpp diff --git a/libs/assets/PS3/assets_cod10_ps3.h b/libs/xassets/PS3/assets_cod10_ps3.h similarity index 100% rename from libs/assets/PS3/assets_cod10_ps3.h rename to libs/xassets/PS3/assets_cod10_ps3.h diff --git a/libs/assets/PS3/assets_cod11_ps3.cpp b/libs/xassets/PS3/assets_cod11_ps3.cpp similarity index 100% rename from libs/assets/PS3/assets_cod11_ps3.cpp rename to libs/xassets/PS3/assets_cod11_ps3.cpp diff --git a/libs/assets/PS3/assets_cod11_ps3.h b/libs/xassets/PS3/assets_cod11_ps3.h similarity index 100% rename from libs/assets/PS3/assets_cod11_ps3.h rename to libs/xassets/PS3/assets_cod11_ps3.h diff --git a/libs/assets/PS3/assets_cod12_ps3.cpp b/libs/xassets/PS3/assets_cod12_ps3.cpp similarity index 100% rename from libs/assets/PS3/assets_cod12_ps3.cpp rename to libs/xassets/PS3/assets_cod12_ps3.cpp diff --git a/libs/assets/PS3/assets_cod12_ps3.h b/libs/xassets/PS3/assets_cod12_ps3.h similarity index 100% rename from libs/assets/PS3/assets_cod12_ps3.h rename to libs/xassets/PS3/assets_cod12_ps3.h diff --git a/libs/assets/PS3/assets_cod4_ps3.cpp b/libs/xassets/PS3/assets_cod4_ps3.cpp similarity index 100% rename from libs/assets/PS3/assets_cod4_ps3.cpp rename to libs/xassets/PS3/assets_cod4_ps3.cpp diff --git a/libs/assets/PS3/assets_cod4_ps3.h b/libs/xassets/PS3/assets_cod4_ps3.h similarity index 100% rename from libs/assets/PS3/assets_cod4_ps3.h rename to libs/xassets/PS3/assets_cod4_ps3.h diff --git a/libs/assets/PS3/assets_cod5_ps3.cpp b/libs/xassets/PS3/assets_cod5_ps3.cpp similarity index 100% rename from libs/assets/PS3/assets_cod5_ps3.cpp rename to libs/xassets/PS3/assets_cod5_ps3.cpp diff --git a/libs/assets/PS3/assets_cod5_ps3.h b/libs/xassets/PS3/assets_cod5_ps3.h similarity index 100% rename from libs/assets/PS3/assets_cod5_ps3.h rename to libs/xassets/PS3/assets_cod5_ps3.h diff --git a/libs/assets/PS3/assets_cod6_ps3.cpp b/libs/xassets/PS3/assets_cod6_ps3.cpp similarity index 100% rename from libs/assets/PS3/assets_cod6_ps3.cpp rename to libs/xassets/PS3/assets_cod6_ps3.cpp diff --git a/libs/assets/PS3/assets_cod6_ps3.h b/libs/xassets/PS3/assets_cod6_ps3.h similarity index 100% rename from libs/assets/PS3/assets_cod6_ps3.h rename to libs/xassets/PS3/assets_cod6_ps3.h diff --git a/libs/assets/PS3/assets_cod7_ps3.cpp b/libs/xassets/PS3/assets_cod7_ps3.cpp similarity index 100% rename from libs/assets/PS3/assets_cod7_ps3.cpp rename to libs/xassets/PS3/assets_cod7_ps3.cpp diff --git a/libs/assets/PS3/assets_cod7_ps3.h b/libs/xassets/PS3/assets_cod7_ps3.h similarity index 100% rename from libs/assets/PS3/assets_cod7_ps3.h rename to libs/xassets/PS3/assets_cod7_ps3.h diff --git a/libs/assets/PS3/assets_cod8_ps3.cpp b/libs/xassets/PS3/assets_cod8_ps3.cpp similarity index 100% rename from libs/assets/PS3/assets_cod8_ps3.cpp rename to libs/xassets/PS3/assets_cod8_ps3.cpp diff --git a/libs/assets/PS3/assets_cod8_ps3.h b/libs/xassets/PS3/assets_cod8_ps3.h similarity index 100% rename from libs/assets/PS3/assets_cod8_ps3.h rename to libs/xassets/PS3/assets_cod8_ps3.h diff --git a/libs/assets/PS3/assets_cod9_ps3.cpp b/libs/xassets/PS3/assets_cod9_ps3.cpp similarity index 100% rename from libs/assets/PS3/assets_cod9_ps3.cpp rename to libs/xassets/PS3/assets_cod9_ps3.cpp diff --git a/libs/assets/PS3/assets_cod9_ps3.h b/libs/xassets/PS3/assets_cod9_ps3.h similarity index 100% rename from libs/assets/PS3/assets_cod9_ps3.h rename to libs/xassets/PS3/assets_cod9_ps3.h diff --git a/libs/assets/Wii/assets_cod4_wii.cpp b/libs/xassets/Wii/assets_cod4_wii.cpp similarity index 100% rename from libs/assets/Wii/assets_cod4_wii.cpp rename to libs/xassets/Wii/assets_cod4_wii.cpp diff --git a/libs/assets/Wii/assets_cod4_wii.h b/libs/xassets/Wii/assets_cod4_wii.h similarity index 100% rename from libs/assets/Wii/assets_cod4_wii.h rename to libs/xassets/Wii/assets_cod4_wii.h diff --git a/libs/assets/Wii/assets_cod7_wii.cpp b/libs/xassets/Wii/assets_cod7_wii.cpp similarity index 100% rename from libs/assets/Wii/assets_cod7_wii.cpp rename to libs/xassets/Wii/assets_cod7_wii.cpp diff --git a/libs/assets/Wii/assets_cod7_wii.h b/libs/xassets/Wii/assets_cod7_wii.h similarity index 100% rename from libs/assets/Wii/assets_cod7_wii.h rename to libs/xassets/Wii/assets_cod7_wii.h diff --git a/libs/assets/Wii/assets_cod8_wii.cpp b/libs/xassets/Wii/assets_cod8_wii.cpp similarity index 100% rename from libs/assets/Wii/assets_cod8_wii.cpp rename to libs/xassets/Wii/assets_cod8_wii.cpp diff --git a/libs/assets/Wii/assets_cod8_wii.h b/libs/xassets/Wii/assets_cod8_wii.h similarity index 100% rename from libs/assets/Wii/assets_cod8_wii.h rename to libs/xassets/Wii/assets_cod8_wii.h diff --git a/libs/assets/WiiU/assets_cod10_wiiu.cpp b/libs/xassets/WiiU/assets_cod10_wiiu.cpp similarity index 100% rename from libs/assets/WiiU/assets_cod10_wiiu.cpp rename to libs/xassets/WiiU/assets_cod10_wiiu.cpp diff --git a/libs/assets/WiiU/assets_cod10_wiiu.h b/libs/xassets/WiiU/assets_cod10_wiiu.h similarity index 100% rename from libs/assets/WiiU/assets_cod10_wiiu.h rename to libs/xassets/WiiU/assets_cod10_wiiu.h diff --git a/libs/assets/WiiU/assets_cod9_wiiu.cpp b/libs/xassets/WiiU/assets_cod9_wiiu.cpp similarity index 100% rename from libs/assets/WiiU/assets_cod9_wiiu.cpp rename to libs/xassets/WiiU/assets_cod9_wiiu.cpp diff --git a/libs/assets/WiiU/assets_cod9_wiiu.h b/libs/xassets/WiiU/assets_cod9_wiiu.h similarity index 100% rename from libs/assets/WiiU/assets_cod9_wiiu.h rename to libs/xassets/WiiU/assets_cod9_wiiu.h diff --git a/libs/assets/animparts.cpp b/libs/xassets/animparts.cpp similarity index 100% rename from libs/assets/animparts.cpp rename to libs/xassets/animparts.cpp diff --git a/libs/assets/animparts.h b/libs/xassets/animparts.h similarity index 100% rename from libs/assets/animparts.h rename to libs/xassets/animparts.h diff --git a/libs/assets/assetlist.cpp b/libs/xassets/assetlist.cpp similarity index 100% rename from libs/assets/assetlist.cpp rename to libs/xassets/assetlist.cpp diff --git a/libs/assets/assetlist.h b/libs/xassets/assetlist.h similarity index 100% rename from libs/assets/assetlist.h rename to libs/xassets/assetlist.h diff --git a/libs/assets/assetmap.h b/libs/xassets/assetmap.h similarity index 98% rename from libs/assets/assetmap.h rename to libs/xassets/assetmap.h index 4f3daee..b01d027 100644 --- a/libs/assets/assetmap.h +++ b/libs/xassets/assetmap.h @@ -11,7 +11,7 @@ #include "soundcurve.h" #include "loadedsound.h" #include "clipmap.h" -#include "comworld.h" +#include "xcomworld.h" #include "gameworld.h" #include "mapent.h" #include "gfxworld.h" diff --git a/libs/assets/assets.cpp b/libs/xassets/assets.cpp similarity index 99% rename from libs/assets/assets.cpp rename to libs/xassets/assets.cpp index 03a63b4..eb4d028 100644 --- a/libs/assets/assets.cpp +++ b/libs/xassets/assets.cpp @@ -2525,9 +2525,9 @@ void Assets::Load_operandInternalDataUnion(QDataStream *aStream) // ?Load_ComPrimaryLight@@YAX_N@Z at 0x822a6098 -ComPrimaryLight Assets::Load_ComPrimaryLight(QDataStream *aStream) +XComPrimaryLight Assets::Load_ComPrimaryLight(QDataStream *aStream) { - ComPrimaryLight result; + XComPrimaryLight result; *aStream >> result.type @@ -3630,12 +3630,12 @@ Operand Assets::Load_Operand(QDataStream *aStream) // ?Load_ComPrimaryLightArray@@YAX_NH@Z at 0x822a79d0 -QVector Assets::Load_ComPrimaryLightArray(QDataStream *aStream, int count) +QVector Assets::Load_ComPrimaryLightArray(QDataStream *aStream, int count) { - QVector result; + QVector result; for (int i = 0; i < count; i++) { - ComPrimaryLight comPrimaryLight; + XComPrimaryLight comPrimaryLight; *aStream >> comPrimaryLight.type diff --git a/libs/assets/assets.h b/libs/xassets/assets.h similarity index 99% rename from libs/assets/assets.h rename to libs/xassets/assets.h index 0afaaab..fcdce02 100644 --- a/libs/assets/assets.h +++ b/libs/xassets/assets.h @@ -1119,7 +1119,7 @@ struct clipMap_t uint checksum; }; -struct ComPrimaryLight +struct XComPrimaryLight { quint8 type; quint8 canUseShadowMap; @@ -1145,7 +1145,7 @@ struct ComWorld int isInUse; uint primaryLightCount; qint32 primaryLightsPtr; - QVector primaryLights; + QVector primaryLights; }; enum nodeType : qint32 @@ -3051,7 +3051,7 @@ private: RawFile Load_RawFile(QDataStream *aStream); XLocalizeEntry Load_LocalizeEntry(QDataStream *aStream); void Load_operandInternalDataUnion(QDataStream *aStream); - ComPrimaryLight Load_ComPrimaryLight(QDataStream *aStream); + XComPrimaryLight Load_ComPrimaryLight(QDataStream *aStream); CollisionPartition Load_CollisionPartition(QDataStream *aStream); CLeafBrushNodeLeaf Load_CLeafBrushNodeLeaf(QDataStream *aStream, int leafBrushCount); CLeafBrushNodeData Load_CLeafBrushNodeData(QDataStream *aStream, int aNodeCount); @@ -3092,7 +3092,7 @@ private: void Load_LocalizeEntryPtr(QDataStream *aStream); MultiDef Load_MultiDef(QDataStream *aStream); Operand Load_Operand(QDataStream *aStream); - QVector Load_ComPrimaryLightArray(QDataStream *aStream, int count); + QVector Load_ComPrimaryLightArray(QDataStream *aStream, int count); CBrushSide Load_cbrushside_t(QDataStream *aStream); CBrush Load_CBrush(QDataStream *aStream); QVector Load_CollisionPartitionArray(QDataStream *aStream, int count); diff --git a/libs/assets/clipmap.cpp b/libs/xassets/clipmap.cpp similarity index 100% rename from libs/assets/clipmap.cpp rename to libs/xassets/clipmap.cpp diff --git a/libs/assets/clipmap.h b/libs/xassets/clipmap.h similarity index 100% rename from libs/assets/clipmap.h rename to libs/xassets/clipmap.h diff --git a/libs/assets/d3dresource.cpp b/libs/xassets/d3dresource.cpp similarity index 100% rename from libs/assets/d3dresource.cpp rename to libs/xassets/d3dresource.cpp diff --git a/libs/assets/d3dresource.h b/libs/xassets/d3dresource.h similarity index 100% rename from libs/assets/d3dresource.h rename to libs/xassets/d3dresource.h diff --git a/libs/assets/effectdef.cpp b/libs/xassets/effectdef.cpp similarity index 100% rename from libs/assets/effectdef.cpp rename to libs/xassets/effectdef.cpp diff --git a/libs/assets/effectdef.h b/libs/xassets/effectdef.h similarity index 100% rename from libs/assets/effectdef.h rename to libs/xassets/effectdef.h diff --git a/libs/assets/effecttable.cpp b/libs/xassets/effecttable.cpp similarity index 100% rename from libs/assets/effecttable.cpp rename to libs/xassets/effecttable.cpp diff --git a/libs/assets/effecttable.h b/libs/xassets/effecttable.h similarity index 100% rename from libs/assets/effecttable.h rename to libs/xassets/effecttable.h diff --git a/libs/assets/file.cpp b/libs/xassets/file.cpp similarity index 100% rename from libs/assets/file.cpp rename to libs/xassets/file.cpp diff --git a/libs/assets/file.h b/libs/xassets/file.h similarity index 100% rename from libs/assets/file.h rename to libs/xassets/file.h diff --git a/libs/assets/font.cpp b/libs/xassets/font.cpp similarity index 100% rename from libs/assets/font.cpp rename to libs/xassets/font.cpp diff --git a/libs/assets/font.h b/libs/xassets/font.h similarity index 100% rename from libs/assets/font.h rename to libs/xassets/font.h diff --git a/libs/assets/gameworld.cpp b/libs/xassets/gameworld.cpp similarity index 100% rename from libs/assets/gameworld.cpp rename to libs/xassets/gameworld.cpp diff --git a/libs/assets/gameworld.h b/libs/xassets/gameworld.h similarity index 100% rename from libs/assets/gameworld.h rename to libs/xassets/gameworld.h diff --git a/libs/assets/gfximage.cpp b/libs/xassets/gfximage.cpp similarity index 100% rename from libs/assets/gfximage.cpp rename to libs/xassets/gfximage.cpp diff --git a/libs/assets/gfximage.h b/libs/xassets/gfximage.h similarity index 100% rename from libs/assets/gfximage.h rename to libs/xassets/gfximage.h diff --git a/libs/assets/gfxlightdef.cpp b/libs/xassets/gfxlightdef.cpp similarity index 100% rename from libs/assets/gfxlightdef.cpp rename to libs/xassets/gfxlightdef.cpp diff --git a/libs/assets/gfxlightdef.h b/libs/xassets/gfxlightdef.h similarity index 100% rename from libs/assets/gfxlightdef.h rename to libs/xassets/gfxlightdef.h diff --git a/libs/assets/gfxworld.cpp b/libs/xassets/gfxworld.cpp similarity index 100% rename from libs/assets/gfxworld.cpp rename to libs/xassets/gfxworld.cpp diff --git a/libs/assets/gfxworld.h b/libs/xassets/gfxworld.h similarity index 100% rename from libs/assets/gfxworld.h rename to libs/xassets/gfxworld.h diff --git a/libs/assets/loadedsound.cpp b/libs/xassets/loadedsound.cpp similarity index 100% rename from libs/assets/loadedsound.cpp rename to libs/xassets/loadedsound.cpp diff --git a/libs/assets/loadedsound.h b/libs/xassets/loadedsound.h similarity index 100% rename from libs/assets/loadedsound.h rename to libs/xassets/loadedsound.h diff --git a/libs/assets/material.cpp b/libs/xassets/material.cpp similarity index 100% rename from libs/assets/material.cpp rename to libs/xassets/material.cpp diff --git a/libs/assets/material.h b/libs/xassets/material.h similarity index 100% rename from libs/assets/material.h rename to libs/xassets/material.h diff --git a/libs/assets/materialpixelshader.cpp b/libs/xassets/materialpixelshader.cpp similarity index 100% rename from libs/assets/materialpixelshader.cpp rename to libs/xassets/materialpixelshader.cpp diff --git a/libs/assets/materialpixelshader.h b/libs/xassets/materialpixelshader.h similarity index 100% rename from libs/assets/materialpixelshader.h rename to libs/xassets/materialpixelshader.h diff --git a/libs/assets/materialtechset.cpp b/libs/xassets/materialtechset.cpp similarity index 100% rename from libs/assets/materialtechset.cpp rename to libs/xassets/materialtechset.cpp diff --git a/libs/assets/materialtechset.h b/libs/xassets/materialtechset.h similarity index 100% rename from libs/assets/materialtechset.h rename to libs/xassets/materialtechset.h diff --git a/libs/assets/menudef.cpp b/libs/xassets/menudef.cpp similarity index 100% rename from libs/assets/menudef.cpp rename to libs/xassets/menudef.cpp diff --git a/libs/assets/menudef.h b/libs/xassets/menudef.h similarity index 100% rename from libs/assets/menudef.h rename to libs/xassets/menudef.h diff --git a/libs/assets/menulist.cpp b/libs/xassets/menulist.cpp similarity index 100% rename from libs/assets/menulist.cpp rename to libs/xassets/menulist.cpp diff --git a/libs/assets/menulist.h b/libs/xassets/menulist.h similarity index 100% rename from libs/assets/menulist.h rename to libs/xassets/menulist.h diff --git a/libs/assets/scriptstringlist.cpp b/libs/xassets/scriptstringlist.cpp similarity index 100% rename from libs/assets/scriptstringlist.cpp rename to libs/xassets/scriptstringlist.cpp diff --git a/libs/assets/scriptstringlist.h b/libs/xassets/scriptstringlist.h similarity index 100% rename from libs/assets/scriptstringlist.h rename to libs/xassets/scriptstringlist.h diff --git a/libs/assets/weapondef.cpp b/libs/xassets/weapondef.cpp similarity index 100% rename from libs/assets/weapondef.cpp rename to libs/xassets/weapondef.cpp diff --git a/libs/assets/weapondef.h b/libs/xassets/weapondef.h similarity index 100% rename from libs/assets/weapondef.h rename to libs/xassets/weapondef.h diff --git a/libs/assets/xasset.cpp b/libs/xassets/xasset.cpp similarity index 100% rename from libs/assets/xasset.cpp rename to libs/xassets/xasset.cpp diff --git a/libs/assets/xasset.h b/libs/xassets/xasset.h similarity index 100% rename from libs/assets/xasset.h rename to libs/xassets/xasset.h diff --git a/libs/assets/assets.pro b/libs/xassets/xassets.pro similarity index 100% rename from libs/assets/assets.pro rename to libs/xassets/xassets.pro diff --git a/libs/assets/xaudioformatinfo.cpp b/libs/xassets/xaudioformatinfo.cpp similarity index 100% rename from libs/assets/xaudioformatinfo.cpp rename to libs/xassets/xaudioformatinfo.cpp diff --git a/libs/assets/xaudioformatinfo.h b/libs/xassets/xaudioformatinfo.h similarity index 100% rename from libs/assets/xaudioformatinfo.h rename to libs/xassets/xaudioformatinfo.h diff --git a/libs/assets/xaudiopacketaligned.cpp b/libs/xassets/xaudiopacketaligned.cpp similarity index 100% rename from libs/assets/xaudiopacketaligned.cpp rename to libs/xassets/xaudiopacketaligned.cpp diff --git a/libs/assets/xaudiopacketaligned.h b/libs/xassets/xaudiopacketaligned.h similarity index 100% rename from libs/assets/xaudiopacketaligned.h rename to libs/xassets/xaudiopacketaligned.h diff --git a/libs/assets/xaudioreverbsettings.cpp b/libs/xassets/xaudioreverbsettings.cpp similarity index 100% rename from libs/assets/xaudioreverbsettings.cpp rename to libs/xassets/xaudioreverbsettings.cpp diff --git a/libs/assets/xaudioreverbsettings.h b/libs/xassets/xaudioreverbsettings.h similarity index 100% rename from libs/assets/xaudioreverbsettings.h rename to libs/xassets/xaudioreverbsettings.h diff --git a/libs/assets/xaudioseektable.cpp b/libs/xassets/xaudioseektable.cpp similarity index 100% rename from libs/assets/xaudioseektable.cpp rename to libs/xassets/xaudioseektable.cpp diff --git a/libs/assets/xaudioseektable.h b/libs/xassets/xaudioseektable.h similarity index 100% rename from libs/assets/xaudioseektable.h rename to libs/xassets/xaudioseektable.h diff --git a/libs/assets/xaudiosound.cpp b/libs/xassets/xaudiosound.cpp similarity index 100% rename from libs/assets/xaudiosound.cpp rename to libs/xassets/xaudiosound.cpp diff --git a/libs/assets/xaudiosound.h b/libs/xassets/xaudiosound.h similarity index 100% rename from libs/assets/xaudiosound.h rename to libs/xassets/xaudiosound.h diff --git a/libs/assets/xaudiosourceformat.cpp b/libs/xassets/xaudiosourceformat.cpp similarity index 100% rename from libs/assets/xaudiosourceformat.cpp rename to libs/xassets/xaudiosourceformat.cpp diff --git a/libs/assets/xaudiosourceformat.h b/libs/xassets/xaudiosourceformat.h similarity index 100% rename from libs/assets/xaudiosourceformat.h rename to libs/xassets/xaudiosourceformat.h diff --git a/libs/assets/xaudiostreaminfo.cpp b/libs/xassets/xaudiostreaminfo.cpp similarity index 100% rename from libs/assets/xaudiostreaminfo.cpp rename to libs/xassets/xaudiostreaminfo.cpp diff --git a/libs/assets/xaudiostreaminfo.h b/libs/xassets/xaudiostreaminfo.h similarity index 100% rename from libs/assets/xaudiostreaminfo.h rename to libs/xassets/xaudiostreaminfo.h diff --git a/libs/assets/xaudioxmadatainfo.cpp b/libs/xassets/xaudioxmadatainfo.cpp similarity index 100% rename from libs/assets/xaudioxmadatainfo.cpp rename to libs/xassets/xaudioxmadatainfo.cpp diff --git a/libs/assets/xaudioxmadatainfo.h b/libs/xassets/xaudioxmadatainfo.h similarity index 100% rename from libs/assets/xaudioxmadatainfo.h rename to libs/xassets/xaudioxmadatainfo.h diff --git a/libs/assets/xaudioxmaformat.cpp b/libs/xassets/xaudioxmaformat.cpp similarity index 100% rename from libs/assets/xaudioxmaformat.cpp rename to libs/xassets/xaudioxmaformat.cpp diff --git a/libs/assets/xaudioxmaformat.h b/libs/xassets/xaudioxmaformat.h similarity index 100% rename from libs/assets/xaudioxmaformat.h rename to libs/xassets/xaudioxmaformat.h diff --git a/libs/xassets/xaudioxmaloopregion.cpp b/libs/xassets/xaudioxmaloopregion.cpp new file mode 100644 index 0000000..222d2d7 --- /dev/null +++ b/libs/xassets/xaudioxmaloopregion.cpp @@ -0,0 +1,21 @@ +#include "xaudioxmaloopregion.h" + +XAudioXmaLoopRegion::XAudioXmaLoopRegion() +{ + +} + +XAudioXmaLoopRegion::~XAudioXmaLoopRegion() +{ + +} + +void XAudioXmaLoopRegion::ParseData(QDataStream *aStream) +{ + +} + +void XAudioXmaLoopRegion::Clear() +{ + +} diff --git a/libs/xassets/xaudioxmaloopregion.h b/libs/xassets/xaudioxmaloopregion.h new file mode 100644 index 0000000..370e2fb --- /dev/null +++ b/libs/xassets/xaudioxmaloopregion.h @@ -0,0 +1,22 @@ +#ifndef XAUDIOXMALOOPREGION_H +#define XAUDIOXMALOOPREGION_H + +#include "xasset.h" + +class XAudioXmaLoopRegion : public XAsset +{ +public: + XAudioXmaLoopRegion(); + ~XAudioXmaLoopRegion(); + + virtual void ParseData(QDataStream* aStream) override; + virtual void Clear() override; + +private: + unsigned int mLoopStart; + unsigned int mLoopEnd; + quint8 mLoopSubframeEnd; + quint8 mLoopSubframeSkip; +}; + +#endif // XAUDIOXMALOOPREGION_H diff --git a/libs/xassets/xcomprimarylight.cpp b/libs/xassets/xcomprimarylight.cpp new file mode 100644 index 0000000..db2aa33 --- /dev/null +++ b/libs/xassets/xcomprimarylight.cpp @@ -0,0 +1,213 @@ +#include "xcomprimarylight.h" + +XComPrimaryLight::XComPrimaryLight() + : XAsset() + , mType(-1) + , mCanUseShadowMap(-1) + , mExponent(-1) + , mUnused(-1) + , mColor(0, 0, 0) + , mDir(0, 0, 0) + , mOrigin(0, 0, 0) + , mRadius(0.0) + , mCosHalfFovOuter(0.0) + , mCosHalfFovInner(0.0) + , mCosHalfFovExpanded(0.0) + , mRotationLimit(0.0) + , mTranslationLimit(0.0) + , mDefName(new XString()) +{ + +} + +XComPrimaryLight::~XComPrimaryLight() +{ + +} + +void XComPrimaryLight::Clear() +{ + delete mDefName; +} + +XComPrimaryLightArray *XComPrimaryLight::ParseArray(QDataStream *aStream, int aCount) +{ + XComPrimaryLightArray* result = new XComPrimaryLightArray(); + + for (int i = 0; i < aCount; i++) + { + XComPrimaryLight* comPrimaryLight = new XComPrimaryLight(); + comPrimaryLight->ParseData(aStream); + + result->append(comPrimaryLight); + } + + return result; +} + +void XComPrimaryLight::ParseData(QDataStream *aStream) +{ + *aStream + >> mType + >> mCanUseShadowMap + >> mExponent + >> mUnused + >> mColor + >> mDir + >> mOrigin + >> mRadius + >> mCosHalfFovOuter + >> mCosHalfFovInner + >> mCosHalfFovExpanded + >> mRotationLimit + >> mTranslationLimit; + + mDefName->ParseData(aStream); +} + +quint8 XComPrimaryLight::GetType() const +{ + return mType; +} + +quint8 XComPrimaryLight::GetCanUseShadowMap() const +{ + return mCanUseShadowMap; +} + +quint8 XComPrimaryLight::GetExponent() const +{ + return mExponent; +} + +quint8 XComPrimaryLight::GetUnused() const +{ + return mUnused; +} + +QColor XComPrimaryLight::GetColor() const +{ + return mColor; +} + +QVector3D XComPrimaryLight::GetDir() const +{ + return mDir; +} + +QVector3D XComPrimaryLight::GetOrigin() const +{ + return mOrigin; +} + +float XComPrimaryLight::GetRadius() const +{ + return mRadius; +} + +float XComPrimaryLight::GetCosHalfFovOuter() const +{ + return mCosHalfFovOuter; +} + +float XComPrimaryLight::GetCosHalfFovInner() const +{ + return mCosHalfFovInner; +} + +float XComPrimaryLight::GetCosHalfFovExpanded() const +{ + return mCosHalfFovExpanded; +} + +float XComPrimaryLight::GetRotationLimit() const +{ + return mRotationLimit; +} + +float XComPrimaryLight::GetTranslationLimit() const +{ + return mTranslationLimit; +} + +XString* XComPrimaryLight::GetDefName() const +{ + return mDefName; +} + +void XComPrimaryLight::SetType(quint8 aType) +{ + mType = aType; +} + +void XComPrimaryLight::SetCanUseShadowMap(quint8 aCanUseShadowMap) +{ + mCanUseShadowMap = aCanUseShadowMap; +} + +void XComPrimaryLight::SetExponent(quint8 aExponent) +{ + mExponent = aExponent; +} + +void XComPrimaryLight::SetUnused(quint8 aUnused) +{ + mUnused = aUnused; +} + +void XComPrimaryLight::SetColor(const QColor aColor) +{ + mColor = aColor; +} + +void XComPrimaryLight::SetDir(const QVector3D aDir) +{ + mDir = aDir; +} + +void XComPrimaryLight::SetOrigin(const QVector3D aOrigin) +{ + mOrigin = aOrigin; +} + +void XComPrimaryLight::SetRadius(float aRadius) +{ + mRadius = aRadius; +} + +void XComPrimaryLight::SetCosHalfFovOuter(float aCosHalfFovOuter) +{ + mCosHalfFovOuter = aCosHalfFovOuter; +} + +void XComPrimaryLight::SetCosHalfFovInner(float aCosHalfFovInner) +{ + mCosHalfFovInner = aCosHalfFovInner; +} + +void XComPrimaryLight::SetCosHalfFovExpanded(float aCosHalfFovExpanded) +{ + mCosHalfFovExpanded = aCosHalfFovExpanded; +} + +void XComPrimaryLight::SetRotationLimit(float aRotationLimit) +{ + mRotationLimit = aRotationLimit; +} + +void XComPrimaryLight::SetTranslationLimit(float aTranslationLimit) +{ + mTranslationLimit = aTranslationLimit; +} + +void XComPrimaryLight::SetDefName(XString* aDefName) +{ + mDefName = aDefName; +} + +void XComPrimaryLight::SetDefName(const QString aDefName) +{ + if (mDefName != nullptr) { + mDefName->SetString(aDefName); + } +} diff --git a/libs/assets/comprimarylight.h b/libs/xassets/xcomprimarylight.h similarity index 83% rename from libs/assets/comprimarylight.h rename to libs/xassets/xcomprimarylight.h index 42668bb..a70bf95 100644 --- a/libs/assets/comprimarylight.h +++ b/libs/xassets/xcomprimarylight.h @@ -1,5 +1,5 @@ -#ifndef COMPRIMARYLIGHT_H -#define COMPRIMARYLIGHT_H +#ifndef XCOMPRIMARYLIGHT_H +#define XCOMPRIMARYLIGHT_H #include "xasset.h" #include "xstring.h" @@ -7,15 +7,14 @@ #include #include -class ComPrimaryLight; -typedef QVector ComPrimaryLightArray; +class XComPrimaryLight; +typedef QVector XComPrimaryLightArray; -class ComPrimaryLight : public XAsset +class XComPrimaryLight : public XAsset { - Q_OBJECT - public: - explicit ComPrimaryLight(QObject *aParent = nullptr); + XComPrimaryLight(); + ~XComPrimaryLight(); quint8 GetType() const; quint8 GetCanUseShadowMap() const; @@ -32,7 +31,7 @@ public: float GetTranslationLimit() const; XString* GetDefName() const; - static ComPrimaryLightArray* ParseArray(QDataStream *aStream, int aCount); + static XComPrimaryLightArray* ParseArray(QDataStream *aStream, int aCount); virtual void Clear() override; virtual void ParseData(QDataStream *aStream) override; @@ -71,4 +70,4 @@ private: XString* mDefName; }; -#endif // COMPRIMARYLIGHT_H +#endif // XCOMPRIMARYLIGHT_H diff --git a/libs/assets/comworld.cpp b/libs/xassets/xcomworld.cpp similarity index 53% rename from libs/assets/comworld.cpp rename to libs/xassets/xcomworld.cpp index 649d1ee..7081051 100644 --- a/libs/assets/comworld.cpp +++ b/libs/xassets/xcomworld.cpp @@ -1,18 +1,16 @@ -#include "comworld.h" +#include "xcomworld.h" -#include "comprimarylight.h" - -ComWorldAsset::ComWorldAsset(QObject *aParent) - : XAsset(aParent) - , mName(new XString(aParent)) +ComWorld::ComWorld() + : XAsset() + , mName(new XString()) , mInUse(false) , mPrimaryLightCount(-1) - , mPrimaryLights(new ComPrimaryLightArray()) + , mPrimaryLights(new XComPrimaryLightArray()) { } -void ComWorldAsset::Clear() +void ComWorld::Clear() { for (int i = 0; i < mPrimaryLights->size(); i++) { @@ -23,7 +21,7 @@ void ComWorldAsset::Clear() delete mName; } -void ComWorldAsset::ParseData(QDataStream *aStream) +void ComWorld::ParseData(QDataStream *aStream) { mName->ParsePtr(aStream, false); @@ -41,36 +39,36 @@ void ComWorldAsset::ParseData(QDataStream *aStream) { delete mPrimaryLights; } - mPrimaryLights = ComPrimaryLight::ParseArray(aStream, mPrimaryLightCount); + mPrimaryLights = XComPrimaryLight::ParseArray(aStream, mPrimaryLightCount); } } -QString ComWorldAsset::GetName() const +QString ComWorld::GetName() const { return mName->GetString(); } -bool ComWorldAsset::IsInUse() const +bool ComWorld::IsInUse() const { return mInUse; } -quint32 ComWorldAsset::GetPrimaryLightCount() const +quint32 ComWorld::GetPrimaryLightCount() const { return mPrimaryLightCount; } -ComPrimaryLight *ComWorldAsset::GetPrimaryLight(quint32 aIndex) const +XComPrimaryLight *ComWorld::GetPrimaryLight(quint32 aIndex) const { return mPrimaryLights->at(aIndex); } -ComPrimaryLightArray *ComWorldAsset::GetPrimaryLights() const +XComPrimaryLightArray *ComWorld::GetPrimaryLights() const { return mPrimaryLights; } -void ComWorldAsset::SetName(const QString &aName) +void ComWorld::SetName(const QString &aName) { if (aName != nullptr) { @@ -78,7 +76,7 @@ void ComWorldAsset::SetName(const QString &aName) } } -void ComWorldAsset::SetName(XString* aName) +void ComWorld::SetName(XString* aName) { if (aName != nullptr) { @@ -86,7 +84,7 @@ void ComWorldAsset::SetName(XString* aName) } } -void ComWorldAsset::SetInUse(bool aInUse) +void ComWorld::SetInUse(bool aInUse) { mInUse = aInUse; } diff --git a/libs/assets/comworld.h b/libs/xassets/xcomworld.h similarity index 60% rename from libs/assets/comworld.h rename to libs/xassets/xcomworld.h index 50f89de..5a1a537 100644 --- a/libs/assets/comworld.h +++ b/libs/xassets/xcomworld.h @@ -1,19 +1,17 @@ -#ifndef COMWORLD_H -#define COMWORLD_H +#ifndef XCOMWORLD_H +#define XCOMWORLD_H #include "xasset.h" #include "xstring.h" -#include "comprimarylight.h" +#include "xcomprimarylight.h" #include #include -class ComWorldAsset : public XAsset +class ComWorld : public XAsset { - Q_OBJECT - public: - explicit ComWorldAsset(QObject *aParent = nullptr); + explicit ComWorld(); virtual void Clear() override; virtual void ParseData(QDataStream *aStream) override; @@ -21,8 +19,8 @@ public: QString GetName() const; bool IsInUse() const; quint32 GetPrimaryLightCount() const; - ComPrimaryLight* GetPrimaryLight(quint32 aIndex) const; - ComPrimaryLightArray* GetPrimaryLights() const; + XComPrimaryLight* GetPrimaryLight(quint32 aIndex) const; + XComPrimaryLightArray* GetPrimaryLights() const; public slots: void SetName(const QString &aName); @@ -33,7 +31,7 @@ private: XString* mName; bool mInUse; quint32 mPrimaryLightCount; - ComPrimaryLightArray* mPrimaryLights; + XComPrimaryLightArray* mPrimaryLights; }; -#endif // COMWORLD_H +#endif // XCOMWORLD_H diff --git a/libs/assets/xeditfielddefinition.cpp b/libs/xassets/xeditfielddefinition.cpp similarity index 100% rename from libs/assets/xeditfielddefinition.cpp rename to libs/xassets/xeditfielddefinition.cpp diff --git a/libs/assets/xeditfielddefinition.h b/libs/xassets/xeditfielddefinition.h similarity index 100% rename from libs/assets/xeditfielddefinition.h rename to libs/xassets/xeditfielddefinition.h diff --git a/libs/assets/xloadedsound.cpp b/libs/xassets/xloadedsound.cpp similarity index 100% rename from libs/assets/xloadedsound.cpp rename to libs/xassets/xloadedsound.cpp diff --git a/libs/assets/xloadedsound.h b/libs/xassets/xloadedsound.h similarity index 100% rename from libs/assets/xloadedsound.h rename to libs/xassets/xloadedsound.h diff --git a/libs/assets/xlocalizeentry.cpp b/libs/xassets/xlocalizeentry.cpp similarity index 100% rename from libs/assets/xlocalizeentry.cpp rename to libs/xassets/xlocalizeentry.cpp diff --git a/libs/assets/xlocalizeentry.h b/libs/xassets/xlocalizeentry.h similarity index 100% rename from libs/assets/xlocalizeentry.h rename to libs/xassets/xlocalizeentry.h diff --git a/libs/xassets/xmapents.cpp b/libs/xassets/xmapents.cpp new file mode 100644 index 0000000..71aabd7 --- /dev/null +++ b/libs/xassets/xmapents.cpp @@ -0,0 +1,22 @@ +#include "xmapents.h" + +XMapEnts::XMapEnts() + : XAsset() +{ + +} + +XMapEnts::~XMapEnts() +{ + +} + +void XMapEnts::Clear() +{ + +} + +void XMapEnts::ParseData(QDataStream *aStream) +{ + +} diff --git a/libs/xassets/xmapents.h b/libs/xassets/xmapents.h new file mode 100644 index 0000000..da44c72 --- /dev/null +++ b/libs/xassets/xmapents.h @@ -0,0 +1,22 @@ +#ifndef XMAPENTS_H +#define XMAPENTS_H + +#include "xasset.h" +#include "xstring.h" + +class XMapEnts : public XAsset +{ +public: + XMapEnts(); + ~XMapEnts(); + + virtual void Clear() override; + virtual void ParseData(QDataStream *aStream) override; + +private: + XString* mName; + XString* mEntityString; + int mNumEntityChars; +}; + +#endif // XMAPENTS_H diff --git a/libs/assets/xmodel.cpp b/libs/xassets/xmodel.cpp similarity index 100% rename from libs/assets/xmodel.cpp rename to libs/xassets/xmodel.cpp diff --git a/libs/assets/xmodel.h b/libs/xassets/xmodel.h similarity index 100% rename from libs/assets/xmodel.h rename to libs/xassets/xmodel.h diff --git a/libs/assets/xrawfile.cpp b/libs/xassets/xrawfile.cpp similarity index 100% rename from libs/assets/xrawfile.cpp rename to libs/xassets/xrawfile.cpp diff --git a/libs/assets/xrawfile.h b/libs/xassets/xrawfile.h similarity index 100% rename from libs/assets/xrawfile.h rename to libs/xassets/xrawfile.h diff --git a/libs/assets/xreverbsettings.cpp b/libs/xassets/xreverbsettings.cpp similarity index 100% rename from libs/assets/xreverbsettings.cpp rename to libs/xassets/xreverbsettings.cpp diff --git a/libs/assets/xreverbsettings.h b/libs/xassets/xreverbsettings.h similarity index 100% rename from libs/assets/xreverbsettings.h rename to libs/xassets/xreverbsettings.h diff --git a/libs/assets/xsoundalias.cpp b/libs/xassets/xsoundalias.cpp similarity index 100% rename from libs/assets/xsoundalias.cpp rename to libs/xassets/xsoundalias.cpp diff --git a/libs/assets/xsoundalias.h b/libs/xassets/xsoundalias.h similarity index 100% rename from libs/assets/xsoundalias.h rename to libs/xassets/xsoundalias.h diff --git a/libs/xassets/xsoundaliaslist.cpp b/libs/xassets/xsoundaliaslist.cpp new file mode 100644 index 0000000..a1ac592 --- /dev/null +++ b/libs/xassets/xsoundaliaslist.cpp @@ -0,0 +1,16 @@ +#include "xsoundaliaslist.h" + +XSoundAliasList::XSoundAliasList() +{ + +} + +void XSoundAliasList::Clear() +{ + +} + +void XSoundAliasList::ParseData(QDataStream *aStream) +{ + +} diff --git a/libs/xassets/xsoundaliaslist.h b/libs/xassets/xsoundaliaslist.h new file mode 100644 index 0000000..81c72c8 --- /dev/null +++ b/libs/xassets/xsoundaliaslist.h @@ -0,0 +1,20 @@ +#ifndef XSOUNDALIASLIST_H +#define XSOUNDALIASLIST_H + +#include "xasset.h" +#include "xstring.h" + +class XSoundAliasList : public XAsset +{ +public: + XSoundAliasList(); + ~XSoundAliasList(); + + virtual void Clear() override; + virtual void ParseData(QDataStream* aStream) override; + +private: + +}; + +#endif // XSOUNDALIASLIST_H diff --git a/libs/xassets/xsoundcurve.cpp b/libs/xassets/xsoundcurve.cpp new file mode 100644 index 0000000..0f05254 --- /dev/null +++ b/libs/xassets/xsoundcurve.cpp @@ -0,0 +1,16 @@ +#include "xsoundcurve.h" + +XSoundCurve::XSoundCurve() +{ + +} + +void XSoundCurve::Clear() +{ + +} + +void XSoundCurve::ParseData(QDataStream *aStream) +{ + +} diff --git a/libs/xassets/xsoundcurve.h b/libs/xassets/xsoundcurve.h new file mode 100644 index 0000000..dbba2ae --- /dev/null +++ b/libs/xassets/xsoundcurve.h @@ -0,0 +1,18 @@ +#ifndef XSOUNDCURVE_H +#define XSOUNDCURVE_H + +#include "xasset.h" +#include "xstring.h" + +class XSoundCurve: public XAsset +{ +public: + XSoundCurve(); + + virtual void Clear() override; + virtual void ParseData(QDataStream* aStream) override; + +private: +}; + +#endif // XSOUNDCURVE_H diff --git a/libs/assets/xsounddriverglobals.cpp b/libs/xassets/xsounddriverglobals.cpp similarity index 100% rename from libs/assets/xsounddriverglobals.cpp rename to libs/xassets/xsounddriverglobals.cpp diff --git a/libs/assets/xsounddriverglobals.h b/libs/xassets/xsounddriverglobals.h similarity index 100% rename from libs/assets/xsounddriverglobals.h rename to libs/xassets/xsounddriverglobals.h diff --git a/libs/assets/xsoundfile.cpp b/libs/xassets/xsoundfile.cpp similarity index 100% rename from libs/assets/xsoundfile.cpp rename to libs/xassets/xsoundfile.cpp diff --git a/libs/assets/xsoundfile.h b/libs/xassets/xsoundfile.h similarity index 100% rename from libs/assets/xsoundfile.h rename to libs/xassets/xsoundfile.h diff --git a/libs/assets/xsoundfileref.cpp b/libs/xassets/xsoundfileref.cpp similarity index 100% rename from libs/assets/xsoundfileref.cpp rename to libs/xassets/xsoundfileref.cpp diff --git a/libs/assets/xsoundfileref.h b/libs/xassets/xsoundfileref.h similarity index 100% rename from libs/assets/xsoundfileref.h rename to libs/xassets/xsoundfileref.h diff --git a/libs/assets/xstreamedsound.cpp b/libs/xassets/xstreamedsound.cpp similarity index 100% rename from libs/assets/xstreamedsound.cpp rename to libs/xassets/xstreamedsound.cpp diff --git a/libs/assets/xstreamedsound.h b/libs/xassets/xstreamedsound.h similarity index 100% rename from libs/assets/xstreamedsound.h rename to libs/xassets/xstreamedsound.h diff --git a/libs/assets/xstreamfileinfo.cpp b/libs/xassets/xstreamfileinfo.cpp similarity index 100% rename from libs/assets/xstreamfileinfo.cpp rename to libs/xassets/xstreamfileinfo.cpp diff --git a/libs/assets/xstreamfileinfo.h b/libs/xassets/xstreamfileinfo.h similarity index 100% rename from libs/assets/xstreamfileinfo.h rename to libs/xassets/xstreamfileinfo.h diff --git a/libs/assets/xstreamfilename.cpp b/libs/xassets/xstreamfilename.cpp similarity index 100% rename from libs/assets/xstreamfilename.cpp rename to libs/xassets/xstreamfilename.cpp diff --git a/libs/assets/xstreamfilename.h b/libs/xassets/xstreamfilename.h similarity index 100% rename from libs/assets/xstreamfilename.h rename to libs/xassets/xstreamfilename.h diff --git a/libs/assets/xstreamfilenamepacked.cpp b/libs/xassets/xstreamfilenamepacked.cpp similarity index 100% rename from libs/assets/xstreamfilenamepacked.cpp rename to libs/xassets/xstreamfilenamepacked.cpp diff --git a/libs/assets/xstreamfilenamepacked.h b/libs/xassets/xstreamfilenamepacked.h similarity index 100% rename from libs/assets/xstreamfilenamepacked.h rename to libs/xassets/xstreamfilenamepacked.h diff --git a/libs/assets/xstreamfilenameraw.cpp b/libs/xassets/xstreamfilenameraw.cpp similarity index 100% rename from libs/assets/xstreamfilenameraw.cpp rename to libs/xassets/xstreamfilenameraw.cpp diff --git a/libs/assets/xstreamfilenameraw.h b/libs/xassets/xstreamfilenameraw.h similarity index 100% rename from libs/assets/xstreamfilenameraw.h rename to libs/xassets/xstreamfilenameraw.h diff --git a/libs/assets/xstring.cpp b/libs/xassets/xstring.cpp similarity index 100% rename from libs/assets/xstring.cpp rename to libs/xassets/xstring.cpp diff --git a/libs/assets/xstring.h b/libs/xassets/xstring.h similarity index 100% rename from libs/assets/xstring.h rename to libs/xassets/xstring.h diff --git a/libs/assets/xstringtable.cpp b/libs/xassets/xstringtable.cpp similarity index 100% rename from libs/assets/xstringtable.cpp rename to libs/xassets/xstringtable.cpp diff --git a/libs/assets/xstringtable.h b/libs/xassets/xstringtable.h similarity index 100% rename from libs/assets/xstringtable.h rename to libs/xassets/xstringtable.h