lego1: implement more of LegoNavController (#16)

* implement more of LegoNavController

* merge

* use MX_FALSE

* file file perms

* added Timer(), GetTime to LegoNavController

* add a comment about SetControlMax

* remove colon

* add commented out dtor

* revert inheritance for now so we don't accidentally break the interface to ISLE.exe later

* add missing include

* update project files

* update project files

* fix main.cpp

* add offsets

* update project files

* fix line endings

* fix a bug thanks to ASM checker

* add addr for Timer()

* updated project file
This commit is contained in:
Christian Semmler 2023-06-19 10:34:58 +02:00 committed by GitHub
parent f9f8440a3a
commit 5c440b5878
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 334 additions and 35 deletions

View file

@ -1,22 +1,38 @@
#include "legonavcontroller.h" #include "legonavcontroller.h"
int g_mouseDeadzone = 40; #include "legoomni.h"
float g_zeroThreshold = 0.001f; #include "legoutil.h"
float g_movementMaxSpeed = 40.0f;
float g_turnMaxSpeed = 20.0f;
float g_movementMaxAccel = 15.0f;
float g_turnMaxAccel = 30.0f;
float g_movementMinAccel = 4.0f;
float g_turnMinAccel = 15.0f;
float g_movementDecel = 50.0f;
float g_turnDecel = 50.0f;
float g_rotationSensitivity = 0.4f;
MxBool g_turnUseVelocity = 0;
// 0x100f4c28
int g_mouseDeadzone = 40;
// 0x100f4c2c
float g_zeroThreshold = 0.001f;
// 0x100f4c30
float g_movementMaxSpeed = 40.0f;
// 0x100f4c34
float g_turnMaxSpeed = 20.0f;
// 0x100f4c38
float g_movementMaxAccel = 15.0f;
// 0x100f4c3c
float g_turnMaxAccel = 30.0f;
// 0x100f4c40
float g_movementMinAccel = 4.0f;
// 0x100f4c44
float g_turnMinAccel = 15.0f;
// 0x100f4c48
float g_movementDecel = 50.0f;
// 0x100f4c4c
float g_turnDecel = 50.0f;
// 0x100f4c50
float g_turnSensitivity = 0.4f;
// 0x100f4c54
MxBool g_turnUseVelocity = MX_FALSE;
// OFFSET: LEGO1 0x10054d40
void LegoNavController::GetDefaults(int *p_mouseDeadzone, float *p_movementMaxSpeed, float *p_turnMaxSpeed, void LegoNavController::GetDefaults(int *p_mouseDeadzone, float *p_movementMaxSpeed, float *p_turnMaxSpeed,
float *p_movementMaxAccel, float *p_turnMaxAccel, float *p_movementDecel, float *p_movementMaxAccel, float *p_turnMaxAccel, float *p_movementDecel,
float *p_turnDecel, float *p_movementMinAccel, float *p_turnMinAccel, float *p_turnDecel, float *p_movementMinAccel, float *p_turnMinAccel,
float *p_rotationSensitivity, MxBool *p_turnUseVelocity) float *p_turnSensitivity, MxBool *p_turnUseVelocity)
{ {
*p_mouseDeadzone = g_mouseDeadzone; *p_mouseDeadzone = g_mouseDeadzone;
*p_movementMaxSpeed = g_movementMaxSpeed; *p_movementMaxSpeed = g_movementMaxSpeed;
@ -27,14 +43,15 @@ void LegoNavController::GetDefaults(int *p_mouseDeadzone, float *p_movementMaxSp
*p_turnDecel = g_turnDecel; *p_turnDecel = g_turnDecel;
*p_movementMinAccel = g_movementMinAccel; *p_movementMinAccel = g_movementMinAccel;
*p_turnMinAccel = g_turnMinAccel; *p_turnMinAccel = g_turnMinAccel;
*p_rotationSensitivity = g_rotationSensitivity; *p_turnSensitivity = g_turnSensitivity;
*p_turnUseVelocity = g_turnUseVelocity; *p_turnUseVelocity = g_turnUseVelocity;
} }
// OFFSET: LEGO1 0x10054dd0
void LegoNavController::SetDefaults(int p_mouseDeadzone, float p_movementMaxSpeed, float p_turnMaxSpeed, void LegoNavController::SetDefaults(int p_mouseDeadzone, float p_movementMaxSpeed, float p_turnMaxSpeed,
float p_movementMaxAccel, float p_turnMaxAccel, float p_movementDecel, float p_movementMaxAccel, float p_turnMaxAccel, float p_movementDecel,
float p_turnDecel, float p_movementMinAccel, float p_turnMinAccel, float p_turnDecel, float p_movementMinAccel, float p_turnMinAccel,
float p_rotationSensitivity, MxBool p_turnUseVelocity) float p_turnSensitivity, MxBool p_turnUseVelocity)
{ {
g_mouseDeadzone = p_mouseDeadzone; g_mouseDeadzone = p_mouseDeadzone;
g_movementMaxSpeed = p_movementMaxSpeed; g_movementMaxSpeed = p_movementMaxSpeed;
@ -45,10 +62,62 @@ void LegoNavController::SetDefaults(int p_mouseDeadzone, float p_movementMaxSpee
g_turnDecel = p_turnDecel; g_turnDecel = p_turnDecel;
g_movementMinAccel = p_movementMinAccel; g_movementMinAccel = p_movementMinAccel;
g_turnMinAccel = p_turnMinAccel; g_turnMinAccel = p_turnMinAccel;
g_rotationSensitivity = p_rotationSensitivity; g_turnSensitivity = p_turnSensitivity;
g_turnUseVelocity = p_turnUseVelocity; g_turnUseVelocity = p_turnUseVelocity;
} }
// OFFSET: LEGO1 0x10054ac0
LegoNavController::LegoNavController()
{
ResetToDefault();
this->unk_18 = 0.0f;
this->unk_1C = 0.0f;
this->m_targetMovementSpeed = 0.0f;
this->m_targetTurnSpeed = 0.0f;
this->m_movementAccel = 0.0f;
this->m_turnAccel = 0.0f;
this->m_trackDefault = MX_FALSE;
this->m_unk5D = MX_FALSE;
this->m_unk6C = MX_FALSE;
this->m_unk64 = 0;
this->m_unk68 = 0;
this->m_unk60 = 0;
MxTimer *timer = Timer();
this->m_time = timer->GetTime();
// TODO: InputManager()
// LegoInputManager* inputManager = InputManager();
// inputManager->Register(this);
}
// TODO: InputManager()
// OFFSET: LEGO1 0x10054c30
// LegoNavController::~LegoNavController()
// {
// LegoInputManager* inputManager = InputManager();
// inputManager->UnRegister(this);
// }
// TODO: VideoManager()
// OFFSET: LEGO1 0x10054ca0
// void LegoNavController::SetControlMax(int p_hMax, int p_vMax)
// {
// LegoVideoManager* videoManager = VideoManager();
// this->m_hMax = p_hMax;
// this->m_vMax = p_vMax;
// Probably checks for MxVideoParamFlags: FULL_SCREEN
// if ((videoManager->m_unk44 & 0x01) != 0)
// {
// this->m_hMax = 640;
// this->m_vMax = 480;
// }
// }
// OFFSET: LEGO1 0x10054cd0
void LegoNavController::ResetToDefault() void LegoNavController::ResetToDefault()
{ {
this->m_mouseDeadzone = g_mouseDeadzone; this->m_mouseDeadzone = g_mouseDeadzone;
@ -62,5 +131,61 @@ void LegoNavController::ResetToDefault()
this->m_turnMaxSpeed = g_turnMaxSpeed; this->m_turnMaxSpeed = g_turnMaxSpeed;
this->m_movementMaxSpeed = g_movementMaxSpeed; this->m_movementMaxSpeed = g_movementMaxSpeed;
this->m_turnUseVelocity = g_turnUseVelocity; this->m_turnUseVelocity = g_turnUseVelocity;
this->m_rotationSensitivity = g_rotationSensitivity; this->m_turnSensitivity = g_turnSensitivity;
}
// OFFSET: LEGO1 0x10054e40
void LegoNavController::SetTargets(int p_hPos, int p_vPos, MxBool p_accel)
{
if (this->m_trackDefault != MX_FALSE)
{
ResetToDefault();
}
if (p_accel != MX_FALSE)
{
this->m_targetTurnSpeed = CalculateNewTargetSpeed(p_hPos, this->m_hMax / 2, this->m_turnMaxSpeed);
this->m_targetMovementSpeed = CalculateNewTargetSpeed(this->m_vMax - p_vPos, this->m_vMax / 2, this->m_movementMaxSpeed);
this->m_turnAccel = CalculateNewAccel(p_hPos, this->m_hMax / 2, this->m_turnMaxAccel, (int)this->m_turnMinAccel);
this->m_movementAccel = CalculateNewAccel(this->m_vMax - p_vPos, this->m_vMax / 2, this->m_movementMaxAccel, (int)this->m_movementMinAccel);
}
else
{
this->m_targetTurnSpeed = 0.0f;
this->m_targetMovementSpeed = 0.0f;
this->m_movementAccel = this->m_movementDecel;
this->m_turnAccel = this->m_turnDecel;
}
}
// OFFSET: LEGO1 0x10054f10
float LegoNavController::CalculateNewTargetSpeed(int p_pos, int p_center, float p_maxSpeed)
{
float result;
int diff = p_pos - p_center;
if (diff > this->m_mouseDeadzone)
result = (diff - m_mouseDeadzone) * p_maxSpeed / (p_center - m_mouseDeadzone);
else if (diff < -m_mouseDeadzone)
result = (diff + m_mouseDeadzone) * p_maxSpeed / (p_center - m_mouseDeadzone);
else
result = 0.0f;
return result;
}
// OFFSET: LEGO1 0x10054f90
float LegoNavController::CalculateNewAccel(int p_pos, int p_center, float p_maxAccel, int p_minAccel)
{
float result;
int diff = p_pos - p_center;
result = Abs(diff) * p_maxAccel / p_center;
if (result < p_minAccel)
{
result = (float)p_minAccel;
}
return result;
} }

View file

@ -3,6 +3,7 @@
#include "mxcore.h" #include "mxcore.h"
#include "mxbool.h" #include "mxbool.h"
#include "mxtimer.h"
class LegoNavController : public MxCore class LegoNavController : public MxCore
{ {
@ -15,25 +16,45 @@ class LegoNavController : public MxCore
float p_movementMaxAccel, float p_turnMaxAccel, float p_movementDecel, float p_movementMaxAccel, float p_turnMaxAccel, float p_movementDecel,
float p_turnDecel, float p_movementMinAccel, float p_turnMinAccel, float p_turnDecel, float p_movementMinAccel, float p_turnMinAccel,
float p_rotationSensitivity, MxBool p_turnUseVelocity); float p_rotationSensitivity, MxBool p_turnUseVelocity);
LegoNavController();
// virtual ~LegoNavController();
// void SetControlMax(int p_hMax, int p_vMax);
void ResetToDefault(); void ResetToDefault();
void SetTargets(int p_hPos, int p_vPos, MxBool p_accel);
float CalculateNewTargetSpeed(int p_pos, int p_center, float p_maxSpeed);
float CalculateNewAccel(int p_pos, int p_center, float p_maxAccel, int p_minAccel);
private: private:
int unk_08; // known to be set to window width: 640 (default) int m_hMax;
int unk_0C; // known to be set to window height: 480 (default) int m_vMax;
int m_mouseDeadzone; int m_mouseDeadzone;
float m_zeroThreshold; float m_zeroThreshold;
int unk_18[4]; float unk_18;
float unk_1C;
float m_targetMovementSpeed;
float m_targetTurnSpeed;
float m_movementMaxSpeed; float m_movementMaxSpeed;
float m_turnMaxSpeed; float m_turnMaxSpeed;
int unk_30[2]; float m_movementAccel;
float m_turnAccel;
float m_movementMaxAccel; float m_movementMaxAccel;
float m_turnMaxAccel; float m_turnMaxAccel;
float m_movementMinAccel; float m_movementMinAccel;
float m_turnMinAccel; float m_turnMinAccel;
float m_movementDecel; float m_movementDecel;
float m_turnDecel; float m_turnDecel;
float m_rotationSensitivity; float m_turnSensitivity;
MxBool m_turnUseVelocity; MxBool m_turnUseVelocity;
int m_time;
MxBool m_trackDefault;
MxBool m_unk5D;
char m_unk5E[2];
int m_unk60;
int m_unk64;
int m_unk68;
MxBool m_unk6C;
}; };
#endif // LEGONAVCONTROLLER_H #endif // LEGONAVCONTROLLER_H

View file

@ -80,7 +80,6 @@ __declspec(dllexport) LegoSoundManager * SoundManager();
__declspec(dllexport) long Start(MxDSAction *); __declspec(dllexport) long Start(MxDSAction *);
__declspec(dllexport) MxStreamer * Streamer(); __declspec(dllexport) MxStreamer * Streamer();
__declspec(dllexport) MxTickleManager * TickleManager(); __declspec(dllexport) MxTickleManager * TickleManager();
__declspec(dllexport) MxTimer * Timer();
__declspec(dllexport) MxTransitionManager * TransitionManager(); __declspec(dllexport) MxTransitionManager * TransitionManager();
__declspec(dllexport) MxVariableTable * VariableTable(); __declspec(dllexport) MxVariableTable * VariableTable();
__declspec(dllexport) LegoVideoManager * VideoManager(); __declspec(dllexport) LegoVideoManager * VideoManager();

10
LEGO1/legoutil.h Normal file
View file

@ -0,0 +1,10 @@
#ifndef LEGOUTIL_H
#define LEGOUTIL_H
template <class T>
inline T Abs(T p_t)
{
return p_t < 0 ? -p_t : p_t;
}
#endif // LEGOUTIL_H

View file

@ -65,3 +65,9 @@ long MxOmni::Notify(MxParam &p)
// FIXME: Stub // FIXME: Stub
return 0; return 0;
} }
// OFFSET: LEGO1 0x100aced0
MxTimer *Timer()
{
return MxOmni::GetInstance()->GetTimer();
}

View file

@ -58,7 +58,8 @@ class MxOmni : public MxCore
MxCriticalSection m_criticalsection; // 0x48 MxCriticalSection m_criticalsection; // 0x48
int m_unk64; // 0x64 int m_unk64; // 0x64
}; };
__declspec(dllexport) MxTimer * Timer();
#endif // MXOMNI_H #endif // MXOMNI_H

159
isle.mak
View file

@ -472,8 +472,11 @@ DEP_CPP_MXCOR=\
# Begin Source File # Begin Source File
SOURCE=.\LEGO1\dllmain.cpp SOURCE=.\LEGO1\dllmain.cpp
DEP_CPP_DLLMA=\
".\LEGO1\legoinc.h"\
"$(INTDIR)\dllmain.obj" : $(SOURCE) "$(INTDIR)"
"$(INTDIR)\dllmain.obj" : $(SOURCE) $(DEP_CPP_DLLMA) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE) $(CPP) $(CPP_PROJ) $(SOURCE)
@ -485,30 +488,34 @@ SOURCE=.\LEGO1\legoomni.cpp
DEP_CPP_LEGOO=\ DEP_CPP_LEGOO=\
".\LEGO1\lego3dmanager.h"\ ".\LEGO1\lego3dmanager.h"\
".\LEGO1\lego3dview.h"\ ".\LEGO1\lego3dview.h"\
".\LEGO1\legoanimationmanager.h"\
".\LEGO1\legobuildingmanager.h"\
".\LEGO1\legoentity.h"\ ".\LEGO1\legoentity.h"\
".\LEGO1\legogamestate.h"\ ".\LEGO1\legogamestate.h"\
".\LEGO1\legoinc.h"\
".\LEGO1\legoinputmanager.h"\ ".\LEGO1\legoinputmanager.h"\
".\LEGO1\legomodelpresenter.h"\ ".\LEGO1\legonavcontroller.h"\
".\LEGO1\legoomni.h"\ ".\LEGO1\legoomni.h"\
".\LEGO1\legopartpresenter.h"\
".\LEGO1\legoroi.h"\ ".\LEGO1\legoroi.h"\
".\LEGO1\legovideomanager.h"\ ".\LEGO1\legovideomanager.h"\
".\LEGO1\legoworldpresenter.h"\
".\LEGO1\mxatomid.h"\ ".\LEGO1\mxatomid.h"\
".\LEGO1\mxbackgroundaudiomanager.h"\ ".\LEGO1\mxbackgroundaudiomanager.h"\
".\LEGO1\mxbool.h"\ ".\LEGO1\mxbool.h"\
".\LEGO1\mxcore.h"\ ".\LEGO1\mxcore.h"\
".\LEGO1\mxcriticalsection.h"\
".\LEGO1\mxdsaction.h"\ ".\LEGO1\mxdsaction.h"\
".\LEGO1\mxdsfile.h"\ ".\LEGO1\mxdsfile.h"\
".\LEGO1\mxdsobject.h"\ ".\LEGO1\mxdsobject.h"\
".\LEGO1\mxeventmanager.h"\
".\LEGO1\mxmusicmanager.h"\
".\LEGO1\mxnotificationmanager.h"\
".\LEGO1\mxobjectfactory.h"\
".\LEGO1\mxomni.h"\
".\LEGO1\mxomnicreateflags.h"\ ".\LEGO1\mxomnicreateflags.h"\
".\LEGO1\mxomnicreateparam.h"\ ".\LEGO1\mxomnicreateparam.h"\
".\LEGO1\mxomnicreateparambase.h"\ ".\LEGO1\mxomnicreateparambase.h"\
".\LEGO1\mxpalette.h"\ ".\LEGO1\mxpalette.h"\
".\LEGO1\mxrect32.h"\ ".\LEGO1\mxrect32.h"\
".\LEGO1\mxresult.h"\ ".\LEGO1\mxresult.h"\
".\LEGO1\mxsoundmanager.h"\
".\LEGO1\mxstreamcontroller.h"\ ".\LEGO1\mxstreamcontroller.h"\
".\LEGO1\mxstreamer.h"\ ".\LEGO1\mxstreamer.h"\
".\LEGO1\mxstring.h"\ ".\LEGO1\mxstring.h"\
@ -516,6 +523,7 @@ DEP_CPP_LEGOO=\
".\LEGO1\mxtimer.h"\ ".\LEGO1\mxtimer.h"\
".\LEGO1\mxtransitionmanager.h"\ ".\LEGO1\mxtransitionmanager.h"\
".\LEGO1\mxvariabletable.h"\ ".\LEGO1\mxvariabletable.h"\
".\LEGO1\mxvideomanager.h"\
".\LEGO1\mxvideoparam.h"\ ".\LEGO1\mxvideoparam.h"\
".\LEGO1\mxvideoparamflags.h"\ ".\LEGO1\mxvideoparamflags.h"\
".\LEGO1\viewmanager.h"\ ".\LEGO1\viewmanager.h"\
@ -531,6 +539,7 @@ DEP_CPP_LEGOO=\
SOURCE=.\LEGO1\mxcriticalsection.cpp SOURCE=.\LEGO1\mxcriticalsection.cpp
DEP_CPP_MXCRI=\ DEP_CPP_MXCRI=\
".\LEGO1\legoinc.h"\
".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxcriticalsection.h"\
@ -544,6 +553,7 @@ DEP_CPP_MXCRI=\
SOURCE=.\LEGO1\mxautolocker.cpp SOURCE=.\LEGO1\mxautolocker.cpp
DEP_CPP_MXAUT=\ DEP_CPP_MXAUT=\
".\LEGO1\legoinc.h"\
".\LEGO1\mxautolocker.h"\ ".\LEGO1\mxautolocker.h"\
".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxcriticalsection.h"\
@ -558,6 +568,7 @@ DEP_CPP_MXAUT=\
SOURCE=.\LEGO1\mxtimer.cpp SOURCE=.\LEGO1\mxtimer.cpp
DEP_CPP_MXTIM=\ DEP_CPP_MXTIM=\
".\LEGO1\legoinc.h"\
".\LEGO1\mxbool.h"\ ".\LEGO1\mxbool.h"\
".\LEGO1\mxcore.h"\ ".\LEGO1\mxcore.h"\
".\LEGO1\mxtimer.h"\ ".\LEGO1\mxtimer.h"\
@ -573,8 +584,15 @@ DEP_CPP_MXTIM=\
SOURCE=.\LEGO1\mxomni.cpp SOURCE=.\LEGO1\mxomni.cpp
DEP_CPP_MXOMN=\ DEP_CPP_MXOMN=\
".\LEGO1\legoinc.h"\
".\LEGO1\mxatomid.h"\
".\LEGO1\mxbool.h"\ ".\LEGO1\mxbool.h"\
".\LEGO1\mxcore.h"\ ".\LEGO1\mxcore.h"\
".\LEGO1\mxcriticalsection.h"\
".\LEGO1\mxeventmanager.h"\
".\LEGO1\mxmusicmanager.h"\
".\LEGO1\mxnotificationmanager.h"\
".\LEGO1\mxobjectfactory.h"\
".\LEGO1\mxomni.h"\ ".\LEGO1\mxomni.h"\
".\LEGO1\mxomnicreateflags.h"\ ".\LEGO1\mxomnicreateflags.h"\
".\LEGO1\mxomnicreateparam.h"\ ".\LEGO1\mxomnicreateparam.h"\
@ -582,9 +600,14 @@ DEP_CPP_MXOMN=\
".\LEGO1\mxpalette.h"\ ".\LEGO1\mxpalette.h"\
".\LEGO1\mxrect32.h"\ ".\LEGO1\mxrect32.h"\
".\LEGO1\mxresult.h"\ ".\LEGO1\mxresult.h"\
".\LEGO1\mxsoundmanager.h"\
".\LEGO1\mxstreamcontroller.h"\
".\LEGO1\mxstreamer.h"\
".\LEGO1\mxstring.h"\ ".\LEGO1\mxstring.h"\
".\LEGO1\mxticklemanager.h"\
".\LEGO1\mxtimer.h"\ ".\LEGO1\mxtimer.h"\
".\LEGO1\mxvariabletable.h"\ ".\LEGO1\mxvariabletable.h"\
".\LEGO1\mxvideomanager.h"\
".\LEGO1\mxvideoparam.h"\ ".\LEGO1\mxvideoparam.h"\
".\LEGO1\mxvideoparamflags.h"\ ".\LEGO1\mxvideoparamflags.h"\
@ -599,6 +622,7 @@ DEP_CPP_MXOMN=\
SOURCE=.\LEGO1\mxvideoparam.cpp SOURCE=.\LEGO1\mxvideoparam.cpp
DEP_CPP_MXVID=\ DEP_CPP_MXVID=\
".\LEGO1\mxbool.h"\
".\LEGO1\mxpalette.h"\ ".\LEGO1\mxpalette.h"\
".\LEGO1\mxrect32.h"\ ".\LEGO1\mxrect32.h"\
".\LEGO1\mxvariabletable.h"\ ".\LEGO1\mxvariabletable.h"\
@ -616,6 +640,7 @@ DEP_CPP_MXVID=\
SOURCE=.\LEGO1\mxvideoparamflags.cpp SOURCE=.\LEGO1\mxvideoparamflags.cpp
DEP_CPP_MXVIDE=\ DEP_CPP_MXVIDE=\
".\LEGO1\mxbool.h"\
".\LEGO1\mxvideoparamflags.h"\ ".\LEGO1\mxvideoparamflags.h"\
@ -629,6 +654,7 @@ DEP_CPP_MXVIDE=\
SOURCE=.\LEGO1\mxomnicreateparam.cpp SOURCE=.\LEGO1\mxomnicreateparam.cpp
DEP_CPP_MXOMNI=\ DEP_CPP_MXOMNI=\
".\LEGO1\legoinc.h"\
".\LEGO1\mxbool.h"\ ".\LEGO1\mxbool.h"\
".\LEGO1\mxcore.h"\ ".\LEGO1\mxcore.h"\
".\LEGO1\mxomnicreateflags.h"\ ".\LEGO1\mxomnicreateflags.h"\
@ -652,6 +678,7 @@ DEP_CPP_MXOMNI=\
SOURCE=.\LEGO1\mxomnicreateparambase.cpp SOURCE=.\LEGO1\mxomnicreateparambase.cpp
DEP_CPP_MXOMNIC=\ DEP_CPP_MXOMNIC=\
".\LEGO1\legoinc.h"\
".\LEGO1\mxbool.h"\ ".\LEGO1\mxbool.h"\
".\LEGO1\mxcore.h"\ ".\LEGO1\mxcore.h"\
".\LEGO1\mxomnicreateflags.h"\ ".\LEGO1\mxomnicreateflags.h"\
@ -705,9 +732,48 @@ DEP_CPP_MXOMNICR=\
SOURCE=.\LEGO1\legonavcontroller.cpp SOURCE=.\LEGO1\legonavcontroller.cpp
DEP_CPP_LEGON=\ DEP_CPP_LEGON=\
".\LEGO1\lego3dmanager.h"\
".\LEGO1\lego3dview.h"\
".\LEGO1\legoentity.h"\
".\LEGO1\legogamestate.h"\
".\LEGO1\legoinc.h"\
".\LEGO1\legoinputmanager.h"\
".\LEGO1\legonavcontroller.h"\ ".\LEGO1\legonavcontroller.h"\
".\LEGO1\legoomni.h"\
".\LEGO1\legoroi.h"\
".\LEGO1\legoutil.h"\
".\LEGO1\legovideomanager.h"\
".\LEGO1\mxatomid.h"\
".\LEGO1\mxbackgroundaudiomanager.h"\
".\LEGO1\mxbool.h"\ ".\LEGO1\mxbool.h"\
".\LEGO1\mxcore.h"\ ".\LEGO1\mxcore.h"\
".\LEGO1\mxcriticalsection.h"\
".\LEGO1\mxdsaction.h"\
".\LEGO1\mxdsfile.h"\
".\LEGO1\mxdsobject.h"\
".\LEGO1\mxeventmanager.h"\
".\LEGO1\mxmusicmanager.h"\
".\LEGO1\mxnotificationmanager.h"\
".\LEGO1\mxobjectfactory.h"\
".\LEGO1\mxomni.h"\
".\LEGO1\mxomnicreateflags.h"\
".\LEGO1\mxomnicreateparam.h"\
".\LEGO1\mxomnicreateparambase.h"\
".\LEGO1\mxpalette.h"\
".\LEGO1\mxrect32.h"\
".\LEGO1\mxresult.h"\
".\LEGO1\mxsoundmanager.h"\
".\LEGO1\mxstreamcontroller.h"\
".\LEGO1\mxstreamer.h"\
".\LEGO1\mxstring.h"\
".\LEGO1\mxticklemanager.h"\
".\LEGO1\mxtimer.h"\
".\LEGO1\mxtransitionmanager.h"\
".\LEGO1\mxvariabletable.h"\
".\LEGO1\mxvideomanager.h"\
".\LEGO1\mxvideoparam.h"\
".\LEGO1\mxvideoparamflags.h"\
".\LEGO1\viewmanager.h"\
"$(INTDIR)\legonavcontroller.obj" : $(SOURCE) $(DEP_CPP_LEGON) "$(INTDIR)" "$(INTDIR)\legonavcontroller.obj" : $(SOURCE) $(DEP_CPP_LEGON) "$(INTDIR)"
@ -755,8 +821,10 @@ DEP_CPP_ISLE_=\
".\LEGO1\legobuildingmanager.h"\ ".\LEGO1\legobuildingmanager.h"\
".\LEGO1\legoentity.h"\ ".\LEGO1\legoentity.h"\
".\LEGO1\legogamestate.h"\ ".\LEGO1\legogamestate.h"\
".\LEGO1\legoinc.h"\
".\LEGO1\legoinputmanager.h"\ ".\LEGO1\legoinputmanager.h"\
".\LEGO1\legomodelpresenter.h"\ ".\LEGO1\legomodelpresenter.h"\
".\LEGO1\legonavcontroller.h"\
".\LEGO1\legoomni.h"\ ".\LEGO1\legoomni.h"\
".\LEGO1\legopartpresenter.h"\ ".\LEGO1\legopartpresenter.h"\
".\LEGO1\legoroi.h"\ ".\LEGO1\legoroi.h"\
@ -766,10 +834,15 @@ DEP_CPP_ISLE_=\
".\LEGO1\mxbackgroundaudiomanager.h"\ ".\LEGO1\mxbackgroundaudiomanager.h"\
".\LEGO1\mxbool.h"\ ".\LEGO1\mxbool.h"\
".\LEGO1\mxcore.h"\ ".\LEGO1\mxcore.h"\
".\LEGO1\mxcriticalsection.h"\
".\LEGO1\mxdirectdraw.h"\ ".\LEGO1\mxdirectdraw.h"\
".\LEGO1\mxdsaction.h"\ ".\LEGO1\mxdsaction.h"\
".\LEGO1\mxdsfile.h"\ ".\LEGO1\mxdsfile.h"\
".\LEGO1\mxdsobject.h"\ ".\LEGO1\mxdsobject.h"\
".\LEGO1\mxeventmanager.h"\
".\LEGO1\mxmusicmanager.h"\
".\LEGO1\mxnotificationmanager.h"\
".\LEGO1\mxobjectfactory.h"\
".\LEGO1\mxomni.h"\ ".\LEGO1\mxomni.h"\
".\LEGO1\mxomnicreateflags.h"\ ".\LEGO1\mxomnicreateflags.h"\
".\LEGO1\mxomnicreateparam.h"\ ".\LEGO1\mxomnicreateparam.h"\
@ -777,6 +850,7 @@ DEP_CPP_ISLE_=\
".\LEGO1\mxpalette.h"\ ".\LEGO1\mxpalette.h"\
".\LEGO1\mxrect32.h"\ ".\LEGO1\mxrect32.h"\
".\LEGO1\mxresult.h"\ ".\LEGO1\mxresult.h"\
".\LEGO1\mxsoundmanager.h"\
".\LEGO1\mxstreamcontroller.h"\ ".\LEGO1\mxstreamcontroller.h"\
".\LEGO1\mxstreamer.h"\ ".\LEGO1\mxstreamer.h"\
".\LEGO1\mxstring.h"\ ".\LEGO1\mxstring.h"\
@ -784,6 +858,7 @@ DEP_CPP_ISLE_=\
".\LEGO1\mxtimer.h"\ ".\LEGO1\mxtimer.h"\
".\LEGO1\mxtransitionmanager.h"\ ".\LEGO1\mxtransitionmanager.h"\
".\LEGO1\mxvariabletable.h"\ ".\LEGO1\mxvariabletable.h"\
".\LEGO1\mxvideomanager.h"\
".\LEGO1\mxvideoparam.h"\ ".\LEGO1\mxvideoparam.h"\
".\LEGO1\mxvideoparamflags.h"\ ".\LEGO1\mxvideoparamflags.h"\
".\LEGO1\viewmanager.h"\ ".\LEGO1\viewmanager.h"\
@ -798,35 +873,42 @@ DEP_CPP_ISLE_=\
# Begin Source File # Begin Source File
SOURCE=.\ISLE\main.cpp SOURCE=.\ISLE\main.cpp
!IF "$(CFG)" == "ISLE - Win32 Release"
DEP_CPP_MAIN_=\ DEP_CPP_MAIN_=\
".\ISLE\define.h"\ ".\ISLE\define.h"\
".\ISLE\isle.h"\ ".\ISLE\isle.h"\
".\LEGO1\lego3dmanager.h"\ ".\LEGO1\lego3dmanager.h"\
".\LEGO1\lego3dview.h"\ ".\LEGO1\lego3dview.h"\
".\LEGO1\legoanimationmanager.h"\
".\LEGO1\legobuildingmanager.h"\
".\LEGO1\legoentity.h"\ ".\LEGO1\legoentity.h"\
".\LEGO1\legogamestate.h"\ ".\LEGO1\legogamestate.h"\
".\LEGO1\legoinc.h"\
".\LEGO1\legoinputmanager.h"\ ".\LEGO1\legoinputmanager.h"\
".\LEGO1\legomodelpresenter.h"\ ".\LEGO1\legonavcontroller.h"\
".\LEGO1\legoomni.h"\ ".\LEGO1\legoomni.h"\
".\LEGO1\legopartpresenter.h"\
".\LEGO1\legoroi.h"\ ".\LEGO1\legoroi.h"\
".\LEGO1\legovideomanager.h"\ ".\LEGO1\legovideomanager.h"\
".\LEGO1\legoworldpresenter.h"\
".\LEGO1\mxatomid.h"\ ".\LEGO1\mxatomid.h"\
".\LEGO1\mxbackgroundaudiomanager.h"\ ".\LEGO1\mxbackgroundaudiomanager.h"\
".\LEGO1\mxbool.h"\ ".\LEGO1\mxbool.h"\
".\LEGO1\mxcore.h"\ ".\LEGO1\mxcore.h"\
".\LEGO1\mxcriticalsection.h"\
".\LEGO1\mxdsaction.h"\ ".\LEGO1\mxdsaction.h"\
".\LEGO1\mxdsfile.h"\ ".\LEGO1\mxdsfile.h"\
".\LEGO1\mxdsobject.h"\ ".\LEGO1\mxdsobject.h"\
".\LEGO1\mxeventmanager.h"\
".\LEGO1\mxmusicmanager.h"\
".\LEGO1\mxnotificationmanager.h"\
".\LEGO1\mxobjectfactory.h"\
".\LEGO1\mxomni.h"\
".\LEGO1\mxomnicreateflags.h"\ ".\LEGO1\mxomnicreateflags.h"\
".\LEGO1\mxomnicreateparam.h"\ ".\LEGO1\mxomnicreateparam.h"\
".\LEGO1\mxomnicreateparambase.h"\ ".\LEGO1\mxomnicreateparambase.h"\
".\LEGO1\mxpalette.h"\ ".\LEGO1\mxpalette.h"\
".\LEGO1\mxrect32.h"\ ".\LEGO1\mxrect32.h"\
".\LEGO1\mxresult.h"\ ".\LEGO1\mxresult.h"\
".\LEGO1\mxsoundmanager.h"\
".\LEGO1\mxstreamcontroller.h"\ ".\LEGO1\mxstreamcontroller.h"\
".\LEGO1\mxstreamer.h"\ ".\LEGO1\mxstreamer.h"\
".\LEGO1\mxstring.h"\ ".\LEGO1\mxstring.h"\
@ -834,6 +916,7 @@ DEP_CPP_MAIN_=\
".\LEGO1\mxtimer.h"\ ".\LEGO1\mxtimer.h"\
".\LEGO1\mxtransitionmanager.h"\ ".\LEGO1\mxtransitionmanager.h"\
".\LEGO1\mxvariabletable.h"\ ".\LEGO1\mxvariabletable.h"\
".\LEGO1\mxvideomanager.h"\
".\LEGO1\mxvideoparam.h"\ ".\LEGO1\mxvideoparam.h"\
".\LEGO1\mxvideoparamflags.h"\ ".\LEGO1\mxvideoparamflags.h"\
".\LEGO1\viewmanager.h"\ ".\LEGO1\viewmanager.h"\
@ -843,6 +926,60 @@ DEP_CPP_MAIN_=\
$(CPP) $(CPP_PROJ) $(SOURCE) $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ISLE - Win32 Debug"
DEP_CPP_MAIN_=\
".\ISLE\define.h"\
".\ISLE\isle.h"\
".\LEGO1\lego3dmanager.h"\
".\LEGO1\lego3dview.h"\
".\LEGO1\legoentity.h"\
".\LEGO1\legogamestate.h"\
".\LEGO1\legoinc.h"\
".\LEGO1\legoinputmanager.h"\
".\LEGO1\legonavcontroller.h"\
".\LEGO1\legoomni.h"\
".\LEGO1\legoroi.h"\
".\LEGO1\legovideomanager.h"\
".\LEGO1\mxatomid.h"\
".\LEGO1\mxbackgroundaudiomanager.h"\
".\LEGO1\mxbool.h"\
".\LEGO1\mxcore.h"\
".\LEGO1\mxcriticalsection.h"\
".\LEGO1\mxdsaction.h"\
".\LEGO1\mxdsfile.h"\
".\LEGO1\mxdsobject.h"\
".\LEGO1\mxeventmanager.h"\
".\LEGO1\mxmusicmanager.h"\
".\LEGO1\mxnotificationmanager.h"\
".\LEGO1\mxobjectfactory.h"\
".\LEGO1\mxomni.h"\
".\LEGO1\mxomnicreateflags.h"\
".\LEGO1\mxomnicreateparam.h"\
".\LEGO1\mxomnicreateparambase.h"\
".\LEGO1\mxpalette.h"\
".\LEGO1\mxrect32.h"\
".\LEGO1\mxresult.h"\
".\LEGO1\mxsoundmanager.h"\
".\LEGO1\mxstreamcontroller.h"\
".\LEGO1\mxstreamer.h"\
".\LEGO1\mxstring.h"\
".\LEGO1\mxticklemanager.h"\
".\LEGO1\mxtimer.h"\
".\LEGO1\mxtransitionmanager.h"\
".\LEGO1\mxvariabletable.h"\
".\LEGO1\mxvideomanager.h"\
".\LEGO1\mxvideoparam.h"\
".\LEGO1\mxvideoparamflags.h"\
".\LEGO1\viewmanager.h"\
"$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
# End Source File # End Source File
################################################################################ ################################################################################
# Begin Source File # Begin Source File

BIN
isle.mdp

Binary file not shown.