OU
/
CWE-ou-minkata
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
2
1
Fork 0
Code Releases Activity
Browse Source

Lots of relative path fixes for the max plugin

Adam Johnson 13 years ago
parent
64a479d35e
commit
2323af6e89
26 changed files with 67 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Sources/Plasma/CoreLibExe/CMakeLists.txt
  2. 16
      Sources/Plasma/CoreLibExe/Pch.h
  3. 2
      Sources/Tools/MaxComponent/plAnimCompProc.cpp
  4. 2
      Sources/Tools/MaxComponent/plAnimComponent.cpp
  5. 4
      Sources/Tools/MaxComponent/plAudioComponents.cpp
  6. 6
      Sources/Tools/MaxComponent/plAutoUIParams.cpp
  7. 2
      Sources/Tools/MaxComponent/plComponent.h
  8. 4
      Sources/Tools/MaxComponent/plComponent.rc
  9. 4
      Sources/Tools/MaxComponent/plGUIComponents.cpp
  10. 8
      Sources/Tools/MaxComponent/plMiscComponents.cpp
  11. 2
      Sources/Tools/MaxComponent/plPhysicalComponents.h
  12. 2
      Sources/Tools/MaxComponent/plPickMaterialMap.cpp
  13. 2
      Sources/Tools/MaxComponent/plPythonFileComponent.cpp
  14. 26
      Sources/Tools/MaxComponent/plResponderLink.cpp
  15. 2
      Sources/Tools/MaxComponent/plSmoothComponent.cpp
  16. 4
      Sources/Tools/MaxComponent/plTemplateComponent.cpp
  17. 14
      Sources/Tools/MaxComponent/plTypesComponents.cpp
  18. 12
      Sources/Tools/MaxConvert/hsControlConverter.cpp
  19. 4
      Sources/Tools/MaxConvert/hsMaterialConverter.cpp
  20. 2
      Sources/Tools/MaxConvert/plConvert.cpp
  21. 2
      Sources/Tools/MaxMain/GlobalUtility.cpp
  22. 2
      Sources/Tools/MaxMain/plComponentPanel.cpp
  23. 2
      Sources/Tools/MaxMain/plMaxNode.h
  24. 2
      Sources/Tools/MaxMain/plMaxNodeBase.h
  25. 2
      Sources/Tools/MaxMain/plMaxNodeData.h
  26. 4
      Sources/Tools/MaxMain/plPythonMgr.cpp

1
Sources/Plasma/CoreLibExe/CMakeLists.txt
Unescape View File

@ -1,3 +1,4 @@
include_directories("../../Plasma/CoreLib")
add_definitions(-D_LIB)
set(CoreLibExe_SOURCES

16
Sources/Plasma/CoreLibExe/Pch.h
Unescape View File

@ -36,14 +36,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#pragma warning(push, 3)
#include "../CoreLib/HeadSpin.h"
#include "../CoreLib/hsConfig.h"
#include "../CoreLib/hsTypes.h"
#include "../CoreLib/hsWindows.h"
#include "../CoreLib/hsMalloc.h"
#include "../CoreLib/hsCritSect.h"
#include "../CoreLib/hsUtils.h"
#include "../CoreLib/hsWindows.h"
#include "HeadSpin.h"
#include "hsConfig.h"
#include "hsTypes.h"
#include "hsWindows.h"
#include "hsMalloc.h"
#include "hsCritSect.h"
#include "hsUtils.h"
#include "hsWindows.h"
#pragma warning(pop)

2
Sources/Tools/MaxComponent/plAnimCompProc.cpp
Unescape View File

@ -315,7 +315,7 @@ void plMtlAnimProc::ILoadAnimCombo(HWND hWnd, IParamBlock2* pb)
}
#include "plPickMaterialMap.h"
#include "../MaxMain/plMtlCollector.h"
#include "MaxMain/plMtlCollector.h"
void plMtlAnimProc::IMtlButtonPress(HWND hWnd, IParamBlock2* pb)
{

2
Sources/Tools/MaxComponent/plAnimComponent.cpp
Unescape View File

@ -557,7 +557,7 @@ hsBool plAnimGroupedComponent::GetKeyList( INode *restrictedNode, hsTArray<plKe
}
#include "../pnMessage/plNodeRefMsg.h"
#include "pnMessage/plNodeRefMsg.h"
hsBool plAnimGroupedComponent::PreConvert(plMaxNode *node, plErrorMsg *pErrMsg)
{

4
Sources/Tools/MaxComponent/plAudioComponents.cpp
Unescape View File

@ -58,7 +58,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pnKeyedObject/plKey.h"
//Physics Related
//#include "../plHavok1/plHKPhysical.h" //Physics Comp
//#include "plHavok1/plHKPhysical.h" //Physics Comp
#include "pnSceneObject/plSimulationInterface.h"
#include "MaxMain/plPhysicalProps.h"
#include "plPhysX/plPXPhysical.h"
@ -87,7 +87,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// Fun soft volume stuff
#include "plSoftVolumeComponent.h"
#include "../plIntersect/plSoftVolume.h"
#include "plIntersect/plSoftVolume.h"
// Misc
#include "MaxMain/plMaxCFGFile.h"

6
Sources/Tools/MaxComponent/plAutoUIParams.cpp
Unescape View File

@ -865,9 +865,9 @@ plComponentBase *plPickActivatorListParam::GetComponent(IParamBlock2 *pb, int id
///////////////////////////////////////////////////////////////////////////////////////////
#include "plPickMaterialMap.h"
#include "../MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h"
#include "../plSurface/plLayerInterface.h"
#include "../plGImage/plDynamicTextMap.h"
#include "MaxPlasmaMtls/Layers/plPlasmaMAXLayer.h"
#include "plSurface/plLayerInterface.h"
#include "plGImage/plDynamicTextMap.h"
plPickDynamicTextButtonParam::plPickDynamicTextButtonParam(ParamID id, const char *name) :
plPickButtonParam(id, name, nil, false)

2
Sources/Tools/MaxComponent/plComponent.h
Unescape View File

@ -222,7 +222,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*************************************************************************************************/
#include "plComponentBase.h"
#include "../MaxExport/plErrorMsg.h"
#include "MaxExport/plErrorMsg.h"
class plMaxNode;

4
Sources/Tools/MaxComponent/plComponent.rc
Unescape View File

@ -6938,8 +6938,8 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_ZOOMIN ICON "../MaxComponent/icon1.ico"
IDI_ZOOMOUT ICON "../MaxComponent/zoomin1.ico"
IDI_ZOOMIN ICON "MaxComponent/icon1.ico"
IDI_ZOOMOUT ICON "MaxComponent/zoomin1.ico"
/////////////////////////////////////////////////////////////////////////////
//

4
Sources/Tools/MaxComponent/plGUIComponents.cpp
Unescape View File

@ -2676,7 +2676,7 @@ hsBool plGUIKnobCtrlComponent::PreConvert(plMaxNode *node, plErrorMsg *pErrMsg)
}
// For hackery below (see warning below)
#include "../plAvatar/plAGMasterMod.h"
#include "plAvatar/plAGMasterMod.h"
hsBool plGUIKnobCtrlComponent::Convert(plMaxNode *node, plErrorMsg *pErrMsg)
{
@ -4398,7 +4398,7 @@ hsBool plGUIProgressCtrlComponent::PreConvert(plMaxNode *node, plErrorMsg *pErr
}
// For hackery below (see warning below)
#include "../plAvatar/plAGMasterMod.h"
#include "plAvatar/plAGMasterMod.h"
hsBool plGUIProgressCtrlComponent::Convert(plMaxNode *node, plErrorMsg *pErrMsg)
{

8
Sources/Tools/MaxComponent/plMiscComponents.cpp
Unescape View File

@ -2013,10 +2013,10 @@ hsBool plReferencePointComponent::SetupProperties(plMaxNode *pNode, plErrorMsg *
//
//
#include "../pnNetCommon/plSDLTypes.h"
#include "../MaxConvert/hsMaterialConverter.h"
#include "../plSurface/hsGMaterial.h"
#include "../plSurface/plLayerInterface.h"
#include "pnNetCommon/plSDLTypes.h"
#include "MaxConvert/hsMaterialConverter.h"
#include "plSurface/hsGMaterial.h"
#include "plSurface/plLayerInterface.h"
#include "plCreatableIndex.h"
class plNetSyncComponent : public plComponent

2
Sources/Tools/MaxComponent/plPhysicalComponents.h
Unescape View File

@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <map>
#include "plPhysical.h"
#include "../plAvatar/plSwimRegion.h"
#include "plAvatar/plSwimRegion.h"
/////////////////////////////////////////////////////////////////////////////////////////////////
//

2
Sources/Tools/MaxComponent/plPickMaterialMap.cpp
Unescape View File

@ -93,7 +93,7 @@ bool plPickMaterialMap::PickTexmap(IParamBlock2 *pb, int id)
return IPickMaterial(pb, id, BROWSE_MAPSONLY);
}
#include "../MaxMain/plMtlCollector.h"
#include "MaxMain/plMtlCollector.h"
#include "resource.h"
static bool GetPickedMtl(HWND hDlg, Mtl** mtl)

2
Sources/Tools/MaxComponent/plPythonFileComponent.cpp
Unescape View File

@ -388,7 +388,7 @@ hsBool plPythonFileComponent::PreConvert(plMaxNode *node, plErrorMsg *pErrMsg)
}
#include "plActivatorBaseComponent.h"
#include "../pnKeyedObject/plKey.h"
#include "pnKeyedObject/plKey.h"
#include "plResponderComponent.h"
hsBool plPythonFileComponent::Convert(plMaxNode *node, plErrorMsg *pErrMsg)

26
Sources/Tools/MaxComponent/plResponderLink.cpp
Unescape View File

@ -368,7 +368,7 @@ void plResponderLinkProc::ILoadParentAgeFilenamesCombo(HWND hWnd, IParamBlock2 *
#include "plComponentBase.h"
// Needed for message creation
#include "../plModifier/plResponderModifier.h"
#include "plModifier/plResponderModifier.h"
enum
{
@ -495,7 +495,7 @@ static plResponderEnableProc gResponderEnableProc;
///////////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////
#include "../pnMessage/plEnableMsg.h"
#include "pnMessage/plEnableMsg.h"
enum
{
@ -542,7 +542,7 @@ const char *plResponderCmdPhysEnable::GetInstanceName(IParamBlock2 *pb)
return name;
}
#include "../plMessage/plSimStateMsg.h"
#include "plMessage/plSimStateMsg.h"
plMessage *plResponderCmdPhysEnable::CreateMsg(plMaxNode* node, plErrorMsg *pErrMsg, IParamBlock2 *pb)
{
plMaxNode* physNode = (plMaxNode*)pb->GetINode(kEnablePhysNode);
@ -607,7 +607,7 @@ const char *plResponderCmdOneShot::GetInstanceName(IParamBlock2 *pb)
return name;
}
#include "../plMessage/plOneShotMsg.h"
#include "plMessage/plOneShotMsg.h"
#include "plOneShotComponent.h"
plMessage *plResponderCmdOneShot::CreateMsg(plMaxNode* node, plErrorMsg *pErrMsg, IParamBlock2 *pb)
@ -633,7 +633,7 @@ plMessage *plResponderCmdOneShot::CreateMsg(plMaxNode* node, plErrorMsg *pErrMsg
throw "No one-shot component specified";
}
#include "../plMessage/plOneShotCallbacks.h"
#include "plMessage/plOneShotCallbacks.h"
void plResponderCmdOneShot::CreateWait(plMaxNode* node, plErrorMsg* pErrMsg, IParamBlock2 *pb, ResponderWaitInfo& waitInfo)
{
@ -706,7 +706,7 @@ ParamBlockDesc2 *plResponderCmdNotify::GetDesc()
return &gResponderNotifyBlock;
}
#include "../pnMessage/plNotifyMsg.h"
#include "pnMessage/plNotifyMsg.h"
plMessage *plResponderCmdNotify::CreateMsg(plMaxNode* node, plErrorMsg *pErrMsg, IParamBlock2 *pb)
{
@ -765,7 +765,7 @@ const char *plResponderCmdDetectorEnable::GetInstanceName(IParamBlock2 *pb)
return name;
}
#include "../pnMessage/plEnableMsg.h"
#include "pnMessage/plEnableMsg.h"
#include "plActivatorBaseComponent.h"
#include "plVolumeGadgetComponent.h"
#include "plNavigableComponents.h"
@ -963,7 +963,7 @@ const char *plResponderCmdXRegion::GetInstanceName(IParamBlock2 *pb)
return name;
}
#include "../plMessage/plExcludeRegionMsg.h"
#include "plMessage/plExcludeRegionMsg.h"
#include "plExcludeRegionComponent.h"
plMessage *plResponderCmdXRegion::CreateMsg(plMaxNode* node, plErrorMsg *pErrMsg, IParamBlock2 *pb)
@ -1093,7 +1093,7 @@ const char *plResponderCmdCamTransition::GetInstanceName(IParamBlock2 *pb)
return name;
}
#include "../pnMessage/plCameraMsg.h"
#include "pnMessage/plCameraMsg.h"
#include "plCameraComponents.h"
plMessage *plResponderCmdCamTransition::CreateMsg(plMaxNode* node, plErrorMsg *pErrMsg, IParamBlock2 *pb)
@ -1243,7 +1243,7 @@ const char *plResponderCmdDelay::GetInstanceName(IParamBlock2 *pb)
return name;
}
#include "../plMessage/plTimerCallbackMsg.h"
#include "plMessage/plTimerCallbackMsg.h"
plMessage *plResponderCmdDelay::CreateMsg(plMaxNode* node, plErrorMsg *pErrMsg, IParamBlock2 *pb)
{
@ -1368,7 +1368,7 @@ const char *plResponderCmdVisibility::GetInstanceName(IParamBlock2 *pb)
return name;
}
#include "../pnMessage/plEnableMsg.h"
#include "pnMessage/plEnableMsg.h"
static void AddChildKeysRecur(plMaxNode* node, plMessage* msg)
{
@ -1570,8 +1570,8 @@ static plResponderSubWorldProc gResponderSubWorldProc;
///////////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////
#include "../pfMessage/plArmatureEffectMsg.h"
#include "../plAvatar/plArmatureEffects.h"
#include "pfMessage/plArmatureEffectMsg.h"
#include "plAvatar/plArmatureEffects.h"
class plResponderFootSurfaceProc;
extern plResponderFootSurfaceProc gResponderFootSurfaceProc;

2
Sources/Tools/MaxComponent/plSmoothComponent.cpp
Unescape View File

@ -38,7 +38,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// The AccMeshSmooth now does everything the InterMeshSmooth and AvMeshSmooth
// components did, only better and with fewer bugs.
//#include "../plDrawable/plInterMeshSmooth.h"
//#include "plDrawable/plInterMeshSmooth.h"
#include "plDrawable/plAvMeshSmooth.h"
#include "plDrawable/plAccMeshSmooth.h"

4
Sources/Tools/MaxComponent/plTemplateComponent.cpp
Unescape View File

@ -100,7 +100,7 @@ const char* plTemplateComponent::IGetAgeName(plMaxNode *node)
return nil;
}
#include "../MaxMain/plMaxNodeData.h"
#include "MaxMain/plMaxNodeData.h"
// SetupProperties - Internal setup and write-only set properties on the MaxNode. No reading
// of properties on the MaxNode, as it's still indeterminant.
@ -150,7 +150,7 @@ hsBool plTemplateComponent::Convert(plMaxNode *node, plErrorMsg *pErrMsg)
////////////////////////////////////////////////////////////////////////////////
#include "../plModifier/plCloneSpawnModifier.h"
#include "plModifier/plCloneSpawnModifier.h"
class plSpawnComponent : public plComponent
{

14
Sources/Tools/MaxComponent/plTypesComponents.cpp
Unescape View File

@ -230,10 +230,10 @@ plVehicleComponent::plVehicleComponent() : fMod(nil)
fClassDesc->MakeAutoParamBlocks(this);
}
#include "../MaxMain/plPhysicalProps.h"
#include "../pnSceneObject/plSimulationInterface.h"
//#include "../plHavok1/plVehicleModifier.h"
//#include "../plHavok1/plPhysicsGroups.h"
#include "MaxMain/plPhysicalProps.h"
#include "pnSceneObject/plSimulationInterface.h"
//#include "plHavok1/plVehicleModifier.h"
//#include "plHavok1/plPhysicsGroups.h"
/*
void SetupVehiclePhys(plMaxNode* physNode, plMaxNode* node, plErrorMsg* pErrMsg, bool chassis=false)
{
@ -396,7 +396,7 @@ hsBool plVehicleComponent::Convert(plMaxNode *node, plErrorMsg *pErrMsg)
//
//
#include "../plModifier/plMaintainersMarkerModifier.h"
#include "plModifier/plMaintainersMarkerModifier.h"
enum
{
@ -459,10 +459,10 @@ hsBool plMaintainersMarkerComponent::PreConvert(plMaxNode *pNode, plErrorMsg *pE
// Game Marker Component
//
#include "../plModifier/plGameMarkerModifier.h"
#include "plModifier/plGameMarkerModifier.h"
#include "plNotetrackAnim.h"
#include "plPickMaterialMap.h"
#include "../MaxMain/plMtlCollector.h"
#include "MaxMain/plMtlCollector.h"
#include "plResponderMtl.h"
#include "plResponderGetComp.h"
#include "plAnimComponent.h"

12
Sources/Tools/MaxConvert/hsControlConverter.cpp
Unescape View File

@ -2027,12 +2027,12 @@ hsBool hsControlConverter::IGetSubAnimByName( Animatable *anim, TSTR &name, Ani
// bad craziness, isolated here.
#include "plConvert.h"
#include "plgDispatch.h"
#include "../MaxComponent/plAnimComponent.h"
#include "../MaxComponent/plCameraComponents.h"
#include "../../../Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.h"
#include "../../../Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.h"
#include "../../../Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.h"
#include "../../../Sources/Plasma/NucleusLib/pnSceneObject/plSceneObject.h"
#include "MaxComponent/plAnimComponent.h"
#include "MaxComponent/plCameraComponents.h"
#include "pnMessage/plCameraMsg.h"
#include "plMessage/plAnimCmdMsg.h"
#include "pfCamera/plCameraModifier.h"
#include "pnSceneObject/plSceneObject.h"
void hsControlConverter::IExportAnimatedCameraFOV(plMaxNode* node, hsTArray <hsG3DSMaxKeyFrame>* kfArray)
{

4
Sources/Tools/MaxConvert/hsMaterialConverter.cpp
Unescape View File

@ -1112,7 +1112,7 @@ hsGMaterial *hsMaterialConverter::ICreateMaterial(Mtl *mtl, plMaxNode *node, con
hsGuardEnd;
}
#include "../MaxPlasmaMtls/Materials/plMultipassMtl.h"
#include "MaxPlasmaMtls/Materials/plMultipassMtl.h"
//
// Handle materials for normal non-light, non-particle nodes.
@ -2618,7 +2618,7 @@ void hsMaterialConverter::IAddLayerToMaterial(hsGMaterial *mat, plLayerInterface
//
// Functions called by the converters up above...
//
#include "../MaxPlasmaMtls/Layers/plLayerTex.h"
#include "MaxPlasmaMtls/Layers/plLayerTex.h"
//// IMustBeUniqueMaterial ////////////////////////////////////////////////////
// Fun stuff here. If one of the layers of the material is a dynamic EnvMap,

2
Sources/Tools/MaxConvert/plConvert.cpp
Unescape View File

@ -248,7 +248,7 @@ hsBool plConvert::Convert()
#endif
}
//#include "../MaxMain/plMaxNodeData.h"
//#include "MaxMain/plMaxNodeData.h"
//#include <set>
hsBool ConvertList(hsTArray<plMaxNode*>& nodes, PMaxNodeFunc p, plErrorMsg *errMsg, plConvertSettings *settings)

2
Sources/Tools/MaxMain/GlobalUtility.cpp
Unescape View File

@ -96,7 +96,7 @@ void DoAllRecur(PMaxNodeFunc p, plMaxNode *node)
}
}
//#include "../MaxComponent/plComponentBase.h"
//#include "MaxComponent/plComponentBase.h"
#include "MaxExport/plExportErrorMsg.h"

2
Sources/Tools/MaxMain/plComponentPanel.cpp
Unescape View File

@ -305,7 +305,7 @@ int plComponentUtil::IFindListItem(plComponentBase* comp)
return ListView_FindItem(GetDlgItem(fhPanel, IDC_COMPLIST), -1, &fi);
}
#include "../MaxComponent/plAutoUIComp.h"
#include "MaxComponent/plAutoUIComp.h"
void plComponentUtil::IAddRollups(plComponentBase* comp)
{

2
Sources/Tools/MaxMain/plMaxNode.h
Unescape View File

@ -32,7 +32,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTemplates.h"
#include "hsMatrix44.h"
#include "iparamb2.h"
#include "../pnKeyedObject/plKey.h"
#include "pnKeyedObject/plKey.h"
#include <map>
class plMaxNode;

2
Sources/Tools/MaxMain/plMaxNodeBase.h
Unescape View File

@ -31,7 +31,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "max.h"
#include "hsMatrix44.h"
#include "hsColorRGBA.h"
#include "../pnKeyedObject/plKey.h"
#include "pnKeyedObject/plKey.h"
#include "plLoadMask.h"
class plLocation;

2
Sources/Tools/MaxMain/plMaxNodeData.h
Unescape View File

@ -33,7 +33,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plRenderLevel.h"
#include "plPhysicalProps.h"
#include "hsBitVector.h"
#include "../pnKeyedObject/plKey.h"
#include "pnKeyedObject/plKey.h"
#include "plLoadMask.h"
class plMaxNodeBase;

4
Sources/Tools/MaxMain/plPythonMgr.cpp
Unescape View File

@ -112,7 +112,7 @@ bool ICallStrFunc(PyObject *dict, char *funcName, char*& val)
}
#include "../MaxComponent/plPythonFileComponent.h"
#include "MaxComponent/plPythonFileComponent.h"
#include "hsUtils.h"
enum ParamTypes
@ -549,7 +549,7 @@ void plPythonMgr::IAddGUISkin(plAutoUIBlock *autoUI, PyObject *tuple, char *para
autoUI->AddPickGUISkinButton(id, nil, paramName, vid, vstates);
}
#include "../MaxComponent/plResponderComponent.h"
#include "MaxComponent/plResponderComponent.h"
void plPythonMgr::IAddResponder(plAutoUIBlock *autoUI, PyObject *tuple, char *paramName, int id, int vid, std::vector<std::string>* vstates)
{

Write Preview
Loading…
Cancel
Save