From c47206617dff353abc6b9d9cf3198de3b5b5126b Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Mon, 8 Jan 2024 04:58:49 -0500 Subject: [PATCH 1/9] Reorganize sources and files (#414) * Reorganize sources * Refactor * Remove relative paths * Renames * Fix gitignore * Remove stuff * Try fixing format script * Fix format * Fix format * Fix naming script * Test format * Fix format --- .github/workflows/format.yml | 11 +- .github/workflows/naming.yml | 10 +- .gitignore | 2 +- 3rdparty/{smack => smacker}/rad.h | 0 3rdparty/{smack => smacker}/smack.h | 0 3rdparty/{smack => smacker}/smack.lib | Bin CMakeLists.txt | 413 +++++++++--------- ISLE/isleapp.cpp | 1 - ISLE/res/resource.h | 8 +- LEGO1/{ => lego/legoomni/include}/act1state.h | 0 LEGO1/{ => lego/legoomni/include}/act2brick.h | 0 .../legoomni/include}/act2policestation.h | 0 LEGO1/{ => lego/legoomni/include}/act3.h | 0 LEGO1/{ => lego/legoomni/include}/act3actor.h | 0 LEGO1/{ => lego/legoomni/include}/act3shark.h | 0 LEGO1/{ => lego/legoomni/include}/act3state.h | 0 LEGO1/{ => lego/legoomni/include}/ambulance.h | 0 .../legoomni/include}/ambulancemissionstate.h | 0 LEGO1/{ => lego/legoomni/include}/animstate.h | 0 .../legoomni/include}/beachhouseentity.h | 0 LEGO1/{ => lego/legoomni/include}/bike.h | 0 .../legoomni/include}/buildingentity.h | 0 LEGO1/{ => lego/legoomni/include}/bumpbouy.h | 0 LEGO1/{ => lego/legoomni/include}/carrace.h | 0 .../legoomni/include}/carracestate.h | 0 LEGO1/{ => lego/legoomni/include}/doors.h | 0 LEGO1/{ => lego/legoomni/include}/dunebuggy.h | 0 .../legoomni/include}/elevatorbottom.h | 0 LEGO1/{ => lego/legoomni/include}/extra.h | 0 .../{ => lego/legoomni/include}/gasstation.h | 0 .../legoomni/include}/gasstationentity.h | 0 .../legoomni/include}/gasstationstate.h | 0 .../{ => lego/legoomni/include}/gifmanager.h | 0 .../{ => lego/legoomni/include}/helicopter.h | 0 .../legoomni/include}/helicopterstate.h | 0 .../{ => lego/legoomni/include}/historybook.h | 0 LEGO1/{ => lego/legoomni/include}/hospital.h | 0 .../legoomni/include}/hospitalentity.h | 0 .../legoomni/include}/hospitalstate.h | 0 .../{ => lego/legoomni/include}/infocenter.h | 0 .../legoomni/include}/infocenterdoor.h | 0 .../legoomni/include}/infocenterentity.h | 0 .../legoomni/include}/infocenterstate.h | 0 LEGO1/{ => lego/legoomni/include}/isle.h | 0 LEGO1/{ => lego/legoomni/include}/isleactor.h | 0 .../legoomni/include}/islepathactor.h | 0 LEGO1/{ => lego/legoomni/include}/jetski.h | 0 .../{ => lego/legoomni/include}/jetskirace.h | 0 .../legoomni/include}/jetskiracestate.h | 0 LEGO1/{ => lego/legoomni/include}/jukebox.h | 0 .../legoomni/include}/jukeboxentity.h | 0 .../legoomni/include}/jukeboxstate.h | 0 .../legoomni/include}/lego3dwavepresenter.h | 0 LEGO1/{ => lego/legoomni/include}/legoact2.h | 0 .../legoomni/include}/legoact2state.h | 0 .../include}/legoactioncontrolpresenter.h | 0 LEGO1/{ => lego/legoomni/include}/legoactor.h | 0 .../legoomni/include}/legoactorpresenter.h | 0 .../legoomni/include}/legoanimactor.h | 0 .../legoomni/include}/legoanimationmanager.h | 0 .../legoomni/include}/legoanimmmpresenter.h | 0 .../legoomni/include}/legoanimpresenter.h | 0 .../legoomni/include}/legobackgroundcolor.h | 0 .../legoomni/include}/legobuildingmanager.h | 0 .../legoomni/include}/legocachesound.h | 0 .../legoomni/include}/legocameracontroller.h | 0 .../legoomni/include}/legocarbuild.h | 0 .../include}/legocarbuildanimpresenter.h | 0 .../legoomni/include}/legocarraceactor.h | 0 .../legoomni/include}/legocontrolmanager.h | 0 .../{ => lego/legoomni/include}/legoentity.h | 2 +- .../legoomni/include}/legoentitypresenter.h | 0 .../include}/legoeventnotificationparam.h | 0 .../legoomni/include}/legoextraactor.h | 0 .../include}/legoflctexturepresenter.h | 0 .../legoomni/include}/legofullscreenmovie.h | 0 .../legoomni/include}/legogamestate.h | 0 .../legoomni/include}/legohideanimpresenter.h | 0 .../legoomni/include}/legoinputmanager.h | 0 .../{ => lego/legoomni/include}/legojetski.h | 0 .../legoomni/include}/legojetskiraceactor.h | 0 .../include}/legoloadcachesoundpresenter.h | 0 .../include}/legolocomotionanimpresenter.h | 0 .../include}/legoloopinganimpresenter.h | 0 .../legoomni/include}/legometerpresenter.h | 0 .../legoomni/include}/legomodelpresenter.h | 0 .../legoomni/include}/legonavcontroller.h | 0 .../legoomni/include}/legoobjectfactory.h | 0 LEGO1/{ => lego/legoomni/include}/legoomni.h | 0 .../legoomni/include}/legopalettepresenter.h | 0 .../legoomni/include}/legopartpresenter.h | 0 .../legoomni/include}/legopathactor.h | 0 .../legoomni/include}/legopathboundary.h | 0 .../legoomni/include}/legopathcontroller.h | 0 .../include}/legopathcontrollerlist.h | 0 .../legoomni/include}/legopathpresenter.h | 0 .../legoomni/include}/legophonemepresenter.h | 0 .../legoomni/include}/legoplantmanager.h | 0 LEGO1/{ => lego/legoomni/include}/legorace.h | 0 .../legoomni/include}/legoraceactor.h | 0 .../{ => lego/legoomni/include}/legoracecar.h | 0 .../legoomni/include}/legosoundmanager.h | 0 LEGO1/{ => lego/legoomni/include}/legostate.h | 0 .../{ => lego/legoomni/include}/legostream.h | 0 .../legoomni/include}/legotexturepresenter.h | 0 .../legoomni/include/legounknown100d7c88.h} | 10 +- .../legoomni/include/legounknown100d9d00.h | 42 ++ .../legoomni/include}/legounksavedatawriter.h | 0 LEGO1/{ => lego/legoomni/include}/legoutil.h | 0 .../legoomni/include}/legovehiclebuildstate.h | 0 .../legoomni/include}/legovideomanager.h | 70 +-- LEGO1/{ => lego/legoomni/include}/legoworld.h | 0 .../legoomni/include}/legoworldlist.h | 0 .../legoomni/include}/legoworldpresenter.h | 0 .../{ => lego/legoomni/include}/motorcycle.h | 0 LEGO1/{ => lego/legoomni/include}/pizza.h | 0 .../legoomni/include}/pizzamissionstate.h | 0 LEGO1/{ => lego/legoomni/include}/pizzeria.h | 0 .../legoomni/include}/pizzeriastate.h | 0 LEGO1/{ => lego/legoomni/include}/police.h | 0 .../legoomni/include}/policeentity.h | 0 .../{ => lego/legoomni/include}/policestate.h | 0 LEGO1/{ => lego/legoomni/include}/racecar.h | 0 .../legoomni/include}/racestandsentity.h | 0 LEGO1/{ => lego/legoomni/include}/racestate.h | 0 LEGO1/{ => lego/legoomni/include}/radio.h | 0 .../{ => lego/legoomni/include}/radiostate.h | 0 .../legoomni/include}/registrationbook.h | 0 LEGO1/{ => lego/legoomni/include}/score.h | 0 .../{ => lego/legoomni/include}/scorestate.h | 0 .../{ => lego/legoomni/include}/skateboard.h | 0 LEGO1/{ => lego/legoomni/include}/towtrack.h | 0 .../legoomni/include}/towtrackmissionstate.h | 0 .../legoomni/src/act1}/act1state.cpp | 0 .../legoomni/src/act2}/act2brick.cpp | 0 .../legoomni/src/act2}/act2policestation.cpp | 0 .../legoomni/src/act2}/legoact2state.cpp | 0 LEGO1/{ => lego/legoomni/src/act3}/act3.cpp | 0 .../legoomni/src/act3}/act3shark.cpp | 0 .../legoomni/src/act3}/act3state.cpp | 0 .../legoomni/src/audio}/legocachesound.cpp | 0 .../audio}/legoloadcachesoundpresenter.cpp | 0 .../legoomni/src/audio}/legosoundmanager.cpp | 0 .../legoomni/src/build}/buildingentity.cpp | 0 .../legoomni/src/build}/dunebuggy.cpp | 0 .../legoomni/src/build}/helicopter.cpp | 0 .../legoomni/src/build}/helicopterstate.cpp | 0 .../{ => lego/legoomni/src/build}/jetski.cpp | 0 .../src/build}/legobuildingmanager.cpp | 0 .../legoomni/src/build}/legocarbuild.cpp | 0 .../src/build}/legovehiclebuildstate.cpp | 0 .../{ => lego/legoomni/src/build}/racecar.cpp | 0 .../legoomni/src/common}/animstate.cpp | 0 .../legoomni/src/common}/gifmanager.cpp | 0 .../common}/legoactioncontrolpresenter.cpp | 0 .../src/common}/legobackgroundcolor.cpp | 0 .../src/common}/legocameracontroller.cpp | 0 .../src/common}/legofullscreenmovie.cpp | 0 .../legoomni/src/common}/legogamestate.cpp | 2 +- .../src/common}/legonavcontroller.cpp | 0 .../src/common}/legoobjectfactory.cpp | 0 .../legoomni/src/common}/legoplantmanager.cpp | 0 .../legoomni/src/common}/legostate.cpp | 0 .../legoomni/src/common}/legostream.cpp | 0 .../src/common}/legounksavedatawriter.cpp | 0 .../legoomni/src/common}/legoutil.cpp | 0 .../src/control}/legocontrolmanager.cpp | 0 .../legoomni/src/entity}/legoactor.cpp | 0 .../legoomni/src/entity}/legoanimactor.cpp | 0 .../legoomni/src/entity}/legoentity.cpp | 0 .../src/entity}/legoentitypresenter.cpp | 0 .../legoomni/src/entity}/legojetski.cpp | 0 .../legoomni/src/entity}/legopathactor.cpp | 0 .../legoomni/src/entity}/legorace.cpp | 0 .../legoomni/src/entity}/legoworld.cpp | 0 .../src/entity}/legoworldpresenter.cpp | 0 .../legoomni/src/gasstation}/gasstation.cpp | 0 .../src/gasstation}/gasstationentity.cpp | 0 .../src/gasstation}/gasstationstate.cpp | 0 .../legoomni/src/hospital}/ambulance.cpp | 0 .../src/hospital}/ambulancemissionstate.cpp | 0 .../legoomni/src/hospital}/hospital.cpp | 0 .../legoomni/src/hospital}/hospitalentity.cpp | 0 .../legoomni/src/hospital}/hospitalstate.cpp | 0 .../src/infocenter}/elevatorbottom.cpp | 0 .../legoomni/src/infocenter}/infocenter.cpp | 0 .../src/infocenter}/infocenterdoor.cpp | 0 .../src/infocenter}/infocenterentity.cpp | 0 .../src/infocenter}/infocenterstate.cpp | 0 .../src/infocenter}/registrationbook.cpp | 0 .../legoomni/src/infocenter}/score.cpp | 0 .../legoomni/src/infocenter}/scorestate.cpp | 0 .../legoomni/src/input}/legoinputmanager.cpp | 0 .../legoomni/src/isle}/beachhouseentity.cpp | 0 LEGO1/{ => lego/legoomni/src/isle}/bike.cpp | 0 .../{ => lego/legoomni/src/isle}/bumpbouy.cpp | 0 .../legoomni/src/isle}/historybook.cpp | 0 LEGO1/{ => lego/legoomni/src/isle}/isle.cpp | 0 .../legoomni/src/isle}/isleactor.cpp | 0 .../legoomni/src/isle}/islepathactor.cpp | 0 .../{ => lego/legoomni/src/isle}/jukebox.cpp | 0 .../legoomni/src/isle}/jukeboxentity.cpp | 0 .../legoomni/src/isle}/jukeboxstate.cpp | 0 .../legoomni/src/isle}/motorcycle.cpp | 0 LEGO1/{ => lego/legoomni/src/isle}/radio.cpp | 0 .../legoomni/src/isle}/radiostate.cpp | 0 .../legoomni/src/isle}/skateboard.cpp | 0 .../{ => lego/legoomni/src/main}/legoomni.cpp | 0 .../notify}/legoeventnotificationparam.cpp | 0 .../src/paths}/legopathcontroller.cpp | 0 .../legoomni/src/paths}/legopathpresenter.cpp | 0 .../legoomni/src/pizzeria}/pizza.cpp | 0 .../src/pizzeria}/pizzamissionstate.cpp | 0 .../legoomni/src/pizzeria}/pizzeria.cpp | 0 .../legoomni/src/pizzeria}/pizzeriastate.cpp | 0 .../{ => lego/legoomni/src/police}/police.cpp | 0 .../legoomni/src/police}/policeentity.cpp | 0 .../legoomni/src/police}/policestate.cpp | 0 .../{ => lego/legoomni/src/race}/carrace.cpp | 0 .../legoomni/src/race}/jetskirace.cpp | 0 .../legoomni/src/race}/racestandsentity.cpp | 0 .../legoomni/src/race}/racestate.cpp | 0 .../legoomni/src/towtrack}/towtrack.cpp | 0 .../src/towtrack}/towtrackmissionstate.cpp | 0 .../src/unknown/legounknown100d7c88.cpp | 12 + .../src/video}/legoanimationmanager.cpp | 0 .../src/video}/legoanimmmpresenter.cpp | 0 .../legoomni/src/video}/legoanimpresenter.cpp | 0 .../src/video}/legocarbuildanimpresenter.cpp | 0 .../src/video}/legoflctexturepresenter.cpp | 0 .../src/video}/legohideanimpresenter.cpp | 0 .../video}/legolocomotionanimpresenter.cpp | 0 .../src/video}/legometerpresenter.cpp | 0 .../src/video}/legomodelpresenter.cpp | 0 .../src/video}/legopalettepresenter.cpp | 0 .../legoomni/src/video}/legopartpresenter.cpp | 0 .../src/video}/legophonemepresenter.cpp | 0 .../src/video}/legotexturepresenter.cpp | 0 .../legoomni/src/video}/legovideomanager.cpp | 4 +- .../sources}/3dmanager/lego3dmanager.cpp | 2 +- .../sources}/3dmanager/lego3dmanager.h | 0 .../sources}/3dmanager/lego3dview.cpp | 2 +- .../{ => lego/sources}/3dmanager/lego3dview.h | 0 .../sources}/3dmanager/legoview1.cpp | 2 +- .../{ => lego/sources}/3dmanager/legoview1.h | 0 .../sources}/3dmanager/tglsurface.cpp | 0 .../{ => lego/sources}/3dmanager/tglsurface.h | 4 +- LEGO1/{ => lego/sources/roi}/legoroi.cpp | 0 LEGO1/{ => lego/sources/roi}/legoroi.h | 0 LEGO1/mxdirectx/mxdirect3d.h | 2 +- LEGO1/mxparam.cpp | 1 - LEGO1/mxunknown100d7c88.cpp | 12 - LEGO1/mxunknown100d9d00.h | 42 -- .../include}/mxactionnotificationparam.h | 0 LEGO1/{ => omni/include}/mxatomid.h | 0 LEGO1/{ => omni/include}/mxatomidcounter.h | 0 LEGO1/{ => omni/include}/mxaudiomanager.h | 0 LEGO1/{ => omni/include}/mxaudiopresenter.h | 0 LEGO1/{ => omni/include}/mxautolocker.h | 0 .../include}/mxbackgroundaudiomanager.h | 0 LEGO1/{ => omni/include}/mxbitmap.h | 0 LEGO1/{ => omni/include}/mxcollection.h | 0 .../include}/mxcompositemediapresenter.h | 0 .../{ => omni/include}/mxcompositepresenter.h | 0 LEGO1/{ => omni/include}/mxcontrolpresenter.h | 0 LEGO1/{ => omni/include}/mxcore.h | 0 LEGO1/{ => omni/include}/mxcriticalsection.h | 0 .../include}/mxdiskstreamcontroller.h | 0 .../{ => omni/include}/mxdiskstreamprovider.h | 0 LEGO1/{ => omni/include}/mxdisplaysurface.h | 0 LEGO1/{ => omni/include}/mxdsaction.h | 0 LEGO1/{ => omni/include}/mxdsactionlist.h | 0 LEGO1/{ => omni/include}/mxdsanim.h | 0 LEGO1/{ => omni/include}/mxdsbuffer.h | 0 LEGO1/{ => omni/include}/mxdschunk.h | 0 LEGO1/{ => omni/include}/mxdsevent.h | 0 LEGO1/{ => omni/include}/mxdsfile.h | 0 LEGO1/{ => omni/include}/mxdsmediaaction.h | 0 LEGO1/{ => omni/include}/mxdsmultiaction.h | 0 LEGO1/{ => omni/include}/mxdsobject.h | 0 LEGO1/{ => omni/include}/mxdsobjectaction.h | 0 LEGO1/{ => omni/include}/mxdsparallelaction.h | 0 LEGO1/{ => omni/include}/mxdsselectaction.h | 0 LEGO1/{ => omni/include}/mxdsserialaction.h | 0 LEGO1/{ => omni/include}/mxdssound.h | 0 LEGO1/{ => omni/include}/mxdssource.h | 0 LEGO1/{ => omni/include}/mxdsstill.h | 0 .../{ => omni/include}/mxdsstreamingaction.h | 0 LEGO1/{ => omni/include}/mxdssubscriber.h | 0 LEGO1/{ => omni/include}/mxdstypes.h | 0 LEGO1/{ => omni/include}/mxentity.h | 0 LEGO1/{ => omni/include}/mxeventmanager.h | 0 LEGO1/{ => omni/include}/mxeventpresenter.h | 0 LEGO1/{ => omni/include}/mxflcpresenter.h | 0 LEGO1/{ => omni/include}/mxhashtable.h | 0 LEGO1/{ => omni/include}/mxioinfo.h | 0 LEGO1/{ => omni/include}/mxlist.h | 0 .../include}/mxloopingflcpresenter.h | 0 .../include}/mxloopingmidipresenter.h | 0 .../include}/mxloopingsmkpresenter.h | 0 LEGO1/{ => omni/include}/mxmediamanager.h | 0 LEGO1/{ => omni/include}/mxmediapresenter.h | 0 LEGO1/{ => omni/include}/mxmidipresenter.h | 0 LEGO1/{ => omni/include}/mxmusicmanager.h | 0 LEGO1/{ => omni/include}/mxmusicpresenter.h | 0 .../include}/mxnextactiondatastart.h | 0 .../include}/mxnotificationmanager.h | 0 .../{ => omni/include}/mxnotificationparam.h | 0 LEGO1/{ => omni/include}/mxobjectfactory.h | 0 LEGO1/{ => omni/include}/mxomni.h | 0 LEGO1/{ => omni/include}/mxomnicreateflags.h | 0 LEGO1/{ => omni/include}/mxomnicreateparam.h | 0 LEGO1/{ => omni/include}/mxpalette.h | 0 LEGO1/{ => omni/include}/mxparam.h | 0 LEGO1/{ => omni/include}/mxpoint32.h | 0 LEGO1/{ => omni/include}/mxpresenter.h | 0 LEGO1/{ => omni/include}/mxpresenterlist.h | 0 LEGO1/{ => omni/include}/mxqueue.h | 0 .../include}/mxramstreamcontroller.h | 0 .../{ => omni/include}/mxramstreamprovider.h | 0 LEGO1/{ => omni/include}/mxrect32.h | 0 LEGO1/{ => omni/include}/mxrectlist.h | 0 LEGO1/{ => omni/include}/mxregion.h | 0 LEGO1/{ => omni/include}/mxregioncursor.h | 0 LEGO1/{ => omni/include}/mxregionlist.h | 0 LEGO1/{ => omni/include}/mxscheduler.h | 0 LEGO1/{ => omni/include}/mxsemaphore.h | 0 LEGO1/{ => omni/include}/mxsize32.h | 0 LEGO1/{ => omni/include}/mxsmack.h | 0 LEGO1/{ => omni/include}/mxsmkpresenter.h | 0 LEGO1/{ => omni/include}/mxsoundmanager.h | 0 LEGO1/{ => omni/include}/mxsoundpresenter.h | 0 LEGO1/{ => omni/include}/mxstillpresenter.h | 0 LEGO1/{ => omni/include}/mxstreamchunk.h | 0 LEGO1/{ => omni/include}/mxstreamchunklist.h | 0 LEGO1/{ => omni/include}/mxstreamcontroller.h | 0 LEGO1/{ => omni/include}/mxstreamer.h | 0 LEGO1/{ => omni/include}/mxstreamlist.h | 0 LEGO1/{ => omni/include}/mxstreamprovider.h | 0 LEGO1/{ => omni/include}/mxstring.h | 0 LEGO1/{ => omni/include}/mxstringlist.h | 0 LEGO1/{ => omni/include}/mxthread.h | 0 LEGO1/{ => omni/include}/mxticklemanager.h | 0 LEGO1/{ => omni/include}/mxtimer.h | 0 .../{ => omni/include}/mxtransitionmanager.h | 0 .../include}/mxtype17notificationparam.h | 0 .../include}/mxtype18notificationparam.h | 0 .../include}/mxtype19notificationparam.h | 0 LEGO1/{ => omni/include}/mxtypes.h | 0 LEGO1/{ => omni/include}/mxvariable.h | 0 LEGO1/{ => omni/include}/mxvariabletable.h | 0 LEGO1/{ => omni/include}/mxvideomanager.h | 0 LEGO1/{ => omni/include}/mxvideoparam.h | 0 LEGO1/{ => omni/include}/mxvideoparamflags.h | 0 LEGO1/{ => omni/include}/mxvideopresenter.h | 0 LEGO1/{ => omni/include}/mxwavepresenter.h | 0 LEGO1/{ => omni/src/action}/mxdsaction.cpp | 0 LEGO1/{ => omni/src/action}/mxdsanim.cpp | 0 LEGO1/{ => omni/src/action}/mxdsevent.cpp | 0 .../{ => omni/src/action}/mxdsmediaaction.cpp | 0 .../{ => omni/src/action}/mxdsmultiaction.cpp | 0 LEGO1/{ => omni/src/action}/mxdsobject.cpp | 0 .../src/action}/mxdsobjectaction.cpp | 0 .../src/action}/mxdsparallelaction.cpp | 0 .../src/action}/mxdsselectaction.cpp | 0 .../src/action}/mxdsserialaction.cpp | 0 LEGO1/{ => omni/src/action}/mxdssound.cpp | 0 LEGO1/{ => omni/src/action}/mxdsstill.cpp | 0 .../src/action}/mxdsstreamingaction.cpp | 0 LEGO1/{ => omni/src/audio}/mxaudiomanager.cpp | 0 .../{ => omni/src/audio}/mxaudiopresenter.cpp | 0 .../src/audio}/mxbackgroundaudiomanager.cpp | 0 .../src/audio}/mxloopingmidipresenter.cpp | 0 .../{ => omni/src/audio}/mxmidipresenter.cpp | 0 LEGO1/{ => omni/src/audio}/mxmusicmanager.cpp | 0 .../{ => omni/src/audio}/mxmusicpresenter.cpp | 0 LEGO1/{ => omni/src/audio}/mxsoundmanager.cpp | 0 .../{ => omni/src/audio}/mxsoundpresenter.cpp | 0 .../{ => omni/src/audio}/mxwavepresenter.cpp | 0 LEGO1/{ => omni/src/common}/mxatomid.cpp | 0 .../{ => omni/src/common}/mxatomidcounter.cpp | 0 .../src/common}/mxcompositemediapresenter.cpp | 0 .../src/common}/mxcompositepresenter.cpp | 0 LEGO1/{ => omni/src/common}/mxcore.cpp | 0 .../{ => omni/src/common}/mxmediamanager.cpp | 0 .../src/common}/mxmediapresenter.cpp | 0 .../{ => omni/src/common}/mxobjectfactory.cpp | 0 LEGO1/{ => omni/src/common}/mxpresenter.cpp | 0 LEGO1/{ => omni/src/common}/mxstring.cpp | 0 .../{ => omni/src/common}/mxticklemanager.cpp | 0 LEGO1/{ => omni/src/common}/mxtimer.cpp | 0 LEGO1/{ => omni/src/common}/mxvariable.cpp | 0 .../{ => omni/src/common}/mxvariabletable.cpp | 0 .../src/control}/mxcontrolpresenter.cpp | 0 LEGO1/{ => omni/src/entity}/mxentity.cpp | 0 LEGO1/{ => omni/src/event}/mxeventmanager.cpp | 0 .../{ => omni/src/event}/mxeventpresenter.cpp | 0 .../{dllmain.cpp => omni/src/main/mxmain.cpp} | 0 LEGO1/{ => omni/src/main}/mxomni.cpp | 0 .../{ => omni/src/main}/mxomnicreateflags.cpp | 0 .../{ => omni/src/main}/mxomnicreateparam.cpp | 0 .../src/notify}/mxactionnotificationparam.cpp | 0 .../src/notify}/mxnotificationmanager.cpp | 0 .../src/notify}/mxnotificationparam.cpp | 0 .../src/notify}/mxtype17notificationparam.cpp | 0 .../src/stream}/mxdiskstreamcontroller.cpp | 0 .../src/stream}/mxdiskstreamprovider.cpp | 0 LEGO1/{ => omni/src/stream}/mxdsbuffer.cpp | 0 LEGO1/{ => omni/src/stream}/mxdschunk.cpp | 0 LEGO1/{ => omni/src/stream}/mxdsfile.cpp | 0 LEGO1/{ => omni/src/stream}/mxdssource.cpp | 0 .../{ => omni/src/stream}/mxdssubscriber.cpp | 0 LEGO1/{ => omni/src/stream}/mxioinfo.cpp | 0 .../src/stream}/mxramstreamcontroller.cpp | 0 .../src/stream}/mxramstreamprovider.cpp | 0 LEGO1/{ => omni/src/stream}/mxstreamchunk.cpp | 0 .../src/stream}/mxstreamcontroller.cpp | 0 LEGO1/{ => omni/src/stream}/mxstreamer.cpp | 0 LEGO1/{ => omni/src/stream}/mxstreamlist.cpp | 0 .../src/stream}/mxstreamprovider.cpp | 0 LEGO1/{ => omni/src/system}/mxautolocker.cpp | 0 .../src/system}/mxcriticalsection.cpp | 0 LEGO1/{ => omni/src/system}/mxscheduler.cpp | 0 LEGO1/{ => omni/src/system}/mxsemaphore.cpp | 0 LEGO1/{ => omni/src/system}/mxthread.cpp | 0 LEGO1/{ => omni/src/video}/mxbitmap.cpp | 0 .../{ => omni/src/video}/mxdisplaysurface.cpp | 0 LEGO1/{ => omni/src/video}/mxflcpresenter.cpp | 0 .../src/video}/mxloopingflcpresenter.cpp | 0 .../src/video}/mxloopingsmkpresenter.cpp | 0 LEGO1/{ => omni/src/video}/mxpalette.cpp | 0 LEGO1/{ => omni/src/video}/mxregion.cpp | 0 LEGO1/{ => omni/src/video}/mxregioncursor.cpp | 0 LEGO1/{ => omni/src/video}/mxsmack.cpp | 0 LEGO1/{ => omni/src/video}/mxsmkpresenter.cpp | 0 .../{ => omni/src/video}/mxstillpresenter.cpp | 0 .../src/video}/mxtransitionmanager.cpp | 0 LEGO1/{ => omni/src/video}/mxvideomanager.cpp | 0 LEGO1/{ => omni/src/video}/mxvideoparam.cpp | 0 .../src/video}/mxvideoparamflags.cpp | 0 .../{ => omni/src/video}/mxvideopresenter.cpp | 0 LEGO1/realtime/roi.h | 4 +- LEGO1/res/resource.h | 22 +- LEGO1/tgl/d3drm/impl.h | 2 +- LEGO1/viewmanager/viewlodlist.h | 4 +- LEGO1/viewmanager/viewroi.h | 4 +- tools/isledecomp/.gitignore | 3 +- 447 files changed, 347 insertions(+), 346 deletions(-) rename 3rdparty/{smack => smacker}/rad.h (100%) rename 3rdparty/{smack => smacker}/smack.h (100%) rename 3rdparty/{smack => smacker}/smack.lib (100%) rename LEGO1/{ => lego/legoomni/include}/act1state.h (100%) rename LEGO1/{ => lego/legoomni/include}/act2brick.h (100%) rename LEGO1/{ => lego/legoomni/include}/act2policestation.h (100%) rename LEGO1/{ => lego/legoomni/include}/act3.h (100%) rename LEGO1/{ => lego/legoomni/include}/act3actor.h (100%) rename LEGO1/{ => lego/legoomni/include}/act3shark.h (100%) rename LEGO1/{ => lego/legoomni/include}/act3state.h (100%) rename LEGO1/{ => lego/legoomni/include}/ambulance.h (100%) rename LEGO1/{ => lego/legoomni/include}/ambulancemissionstate.h (100%) rename LEGO1/{ => lego/legoomni/include}/animstate.h (100%) rename LEGO1/{ => lego/legoomni/include}/beachhouseentity.h (100%) rename LEGO1/{ => lego/legoomni/include}/bike.h (100%) rename LEGO1/{ => lego/legoomni/include}/buildingentity.h (100%) rename LEGO1/{ => lego/legoomni/include}/bumpbouy.h (100%) rename LEGO1/{ => lego/legoomni/include}/carrace.h (100%) rename LEGO1/{ => lego/legoomni/include}/carracestate.h (100%) rename LEGO1/{ => lego/legoomni/include}/doors.h (100%) rename LEGO1/{ => lego/legoomni/include}/dunebuggy.h (100%) rename LEGO1/{ => lego/legoomni/include}/elevatorbottom.h (100%) rename LEGO1/{ => lego/legoomni/include}/extra.h (100%) rename LEGO1/{ => lego/legoomni/include}/gasstation.h (100%) rename LEGO1/{ => lego/legoomni/include}/gasstationentity.h (100%) rename LEGO1/{ => lego/legoomni/include}/gasstationstate.h (100%) rename LEGO1/{ => lego/legoomni/include}/gifmanager.h (100%) rename LEGO1/{ => lego/legoomni/include}/helicopter.h (100%) rename LEGO1/{ => lego/legoomni/include}/helicopterstate.h (100%) rename LEGO1/{ => lego/legoomni/include}/historybook.h (100%) rename LEGO1/{ => lego/legoomni/include}/hospital.h (100%) rename LEGO1/{ => lego/legoomni/include}/hospitalentity.h (100%) rename LEGO1/{ => lego/legoomni/include}/hospitalstate.h (100%) rename LEGO1/{ => lego/legoomni/include}/infocenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/infocenterdoor.h (100%) rename LEGO1/{ => lego/legoomni/include}/infocenterentity.h (100%) rename LEGO1/{ => lego/legoomni/include}/infocenterstate.h (100%) rename LEGO1/{ => lego/legoomni/include}/isle.h (100%) rename LEGO1/{ => lego/legoomni/include}/isleactor.h (100%) rename LEGO1/{ => lego/legoomni/include}/islepathactor.h (100%) rename LEGO1/{ => lego/legoomni/include}/jetski.h (100%) rename LEGO1/{ => lego/legoomni/include}/jetskirace.h (100%) rename LEGO1/{ => lego/legoomni/include}/jetskiracestate.h (100%) rename LEGO1/{ => lego/legoomni/include}/jukebox.h (100%) rename LEGO1/{ => lego/legoomni/include}/jukeboxentity.h (100%) rename LEGO1/{ => lego/legoomni/include}/jukeboxstate.h (100%) rename LEGO1/{ => lego/legoomni/include}/lego3dwavepresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoact2.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoact2state.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoactioncontrolpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoactor.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoactorpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoanimactor.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoanimationmanager.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoanimmmpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoanimpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legobackgroundcolor.h (100%) rename LEGO1/{ => lego/legoomni/include}/legobuildingmanager.h (100%) rename LEGO1/{ => lego/legoomni/include}/legocachesound.h (100%) rename LEGO1/{ => lego/legoomni/include}/legocameracontroller.h (100%) rename LEGO1/{ => lego/legoomni/include}/legocarbuild.h (100%) rename LEGO1/{ => lego/legoomni/include}/legocarbuildanimpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legocarraceactor.h (100%) rename LEGO1/{ => lego/legoomni/include}/legocontrolmanager.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoentity.h (99%) rename LEGO1/{ => lego/legoomni/include}/legoentitypresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoeventnotificationparam.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoextraactor.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoflctexturepresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legofullscreenmovie.h (100%) rename LEGO1/{ => lego/legoomni/include}/legogamestate.h (100%) rename LEGO1/{ => lego/legoomni/include}/legohideanimpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoinputmanager.h (100%) rename LEGO1/{ => lego/legoomni/include}/legojetski.h (100%) rename LEGO1/{ => lego/legoomni/include}/legojetskiraceactor.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoloadcachesoundpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legolocomotionanimpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoloopinganimpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legometerpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legomodelpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legonavcontroller.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoobjectfactory.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoomni.h (100%) rename LEGO1/{ => lego/legoomni/include}/legopalettepresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legopartpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legopathactor.h (100%) rename LEGO1/{ => lego/legoomni/include}/legopathboundary.h (100%) rename LEGO1/{ => lego/legoomni/include}/legopathcontroller.h (100%) rename LEGO1/{ => lego/legoomni/include}/legopathcontrollerlist.h (100%) rename LEGO1/{ => lego/legoomni/include}/legopathpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legophonemepresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoplantmanager.h (100%) rename LEGO1/{ => lego/legoomni/include}/legorace.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoraceactor.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoracecar.h (100%) rename LEGO1/{ => lego/legoomni/include}/legosoundmanager.h (100%) rename LEGO1/{ => lego/legoomni/include}/legostate.h (100%) rename LEGO1/{ => lego/legoomni/include}/legostream.h (100%) rename LEGO1/{ => lego/legoomni/include}/legotexturepresenter.h (100%) rename LEGO1/{mxunknown100d7c88.h => lego/legoomni/include/legounknown100d7c88.h} (59%) create mode 100644 LEGO1/lego/legoomni/include/legounknown100d9d00.h rename LEGO1/{ => lego/legoomni/include}/legounksavedatawriter.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoutil.h (100%) rename LEGO1/{ => lego/legoomni/include}/legovehiclebuildstate.h (100%) rename LEGO1/{ => lego/legoomni/include}/legovideomanager.h (52%) rename LEGO1/{ => lego/legoomni/include}/legoworld.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoworldlist.h (100%) rename LEGO1/{ => lego/legoomni/include}/legoworldpresenter.h (100%) rename LEGO1/{ => lego/legoomni/include}/motorcycle.h (100%) rename LEGO1/{ => lego/legoomni/include}/pizza.h (100%) rename LEGO1/{ => lego/legoomni/include}/pizzamissionstate.h (100%) rename LEGO1/{ => lego/legoomni/include}/pizzeria.h (100%) rename LEGO1/{ => lego/legoomni/include}/pizzeriastate.h (100%) rename LEGO1/{ => lego/legoomni/include}/police.h (100%) rename LEGO1/{ => lego/legoomni/include}/policeentity.h (100%) rename LEGO1/{ => lego/legoomni/include}/policestate.h (100%) rename LEGO1/{ => lego/legoomni/include}/racecar.h (100%) rename LEGO1/{ => lego/legoomni/include}/racestandsentity.h (100%) rename LEGO1/{ => lego/legoomni/include}/racestate.h (100%) rename LEGO1/{ => lego/legoomni/include}/radio.h (100%) rename LEGO1/{ => lego/legoomni/include}/radiostate.h (100%) rename LEGO1/{ => lego/legoomni/include}/registrationbook.h (100%) rename LEGO1/{ => lego/legoomni/include}/score.h (100%) rename LEGO1/{ => lego/legoomni/include}/scorestate.h (100%) rename LEGO1/{ => lego/legoomni/include}/skateboard.h (100%) rename LEGO1/{ => lego/legoomni/include}/towtrack.h (100%) rename LEGO1/{ => lego/legoomni/include}/towtrackmissionstate.h (100%) rename LEGO1/{ => lego/legoomni/src/act1}/act1state.cpp (100%) rename LEGO1/{ => lego/legoomni/src/act2}/act2brick.cpp (100%) rename LEGO1/{ => lego/legoomni/src/act2}/act2policestation.cpp (100%) rename LEGO1/{ => lego/legoomni/src/act2}/legoact2state.cpp (100%) rename LEGO1/{ => lego/legoomni/src/act3}/act3.cpp (100%) rename LEGO1/{ => lego/legoomni/src/act3}/act3shark.cpp (100%) rename LEGO1/{ => lego/legoomni/src/act3}/act3state.cpp (100%) rename LEGO1/{ => lego/legoomni/src/audio}/legocachesound.cpp (100%) rename LEGO1/{ => lego/legoomni/src/audio}/legoloadcachesoundpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/audio}/legosoundmanager.cpp (100%) rename LEGO1/{ => lego/legoomni/src/build}/buildingentity.cpp (100%) rename LEGO1/{ => lego/legoomni/src/build}/dunebuggy.cpp (100%) rename LEGO1/{ => lego/legoomni/src/build}/helicopter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/build}/helicopterstate.cpp (100%) rename LEGO1/{ => lego/legoomni/src/build}/jetski.cpp (100%) rename LEGO1/{ => lego/legoomni/src/build}/legobuildingmanager.cpp (100%) rename LEGO1/{ => lego/legoomni/src/build}/legocarbuild.cpp (100%) rename LEGO1/{ => lego/legoomni/src/build}/legovehiclebuildstate.cpp (100%) rename LEGO1/{ => lego/legoomni/src/build}/racecar.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/animstate.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/gifmanager.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legoactioncontrolpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legobackgroundcolor.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legocameracontroller.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legofullscreenmovie.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legogamestate.cpp (99%) rename LEGO1/{ => lego/legoomni/src/common}/legonavcontroller.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legoobjectfactory.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legoplantmanager.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legostate.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legostream.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legounksavedatawriter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/common}/legoutil.cpp (100%) rename LEGO1/{ => lego/legoomni/src/control}/legocontrolmanager.cpp (100%) rename LEGO1/{ => lego/legoomni/src/entity}/legoactor.cpp (100%) rename LEGO1/{ => lego/legoomni/src/entity}/legoanimactor.cpp (100%) rename LEGO1/{ => lego/legoomni/src/entity}/legoentity.cpp (100%) rename LEGO1/{ => lego/legoomni/src/entity}/legoentitypresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/entity}/legojetski.cpp (100%) rename LEGO1/{ => lego/legoomni/src/entity}/legopathactor.cpp (100%) rename LEGO1/{ => lego/legoomni/src/entity}/legorace.cpp (100%) rename LEGO1/{ => lego/legoomni/src/entity}/legoworld.cpp (100%) rename LEGO1/{ => lego/legoomni/src/entity}/legoworldpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/gasstation}/gasstation.cpp (100%) rename LEGO1/{ => lego/legoomni/src/gasstation}/gasstationentity.cpp (100%) rename LEGO1/{ => lego/legoomni/src/gasstation}/gasstationstate.cpp (100%) rename LEGO1/{ => lego/legoomni/src/hospital}/ambulance.cpp (100%) rename LEGO1/{ => lego/legoomni/src/hospital}/ambulancemissionstate.cpp (100%) rename LEGO1/{ => lego/legoomni/src/hospital}/hospital.cpp (100%) rename LEGO1/{ => lego/legoomni/src/hospital}/hospitalentity.cpp (100%) rename LEGO1/{ => lego/legoomni/src/hospital}/hospitalstate.cpp (100%) rename LEGO1/{ => lego/legoomni/src/infocenter}/elevatorbottom.cpp (100%) rename LEGO1/{ => lego/legoomni/src/infocenter}/infocenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/infocenter}/infocenterdoor.cpp (100%) rename LEGO1/{ => lego/legoomni/src/infocenter}/infocenterentity.cpp (100%) rename LEGO1/{ => lego/legoomni/src/infocenter}/infocenterstate.cpp (100%) rename LEGO1/{ => lego/legoomni/src/infocenter}/registrationbook.cpp (100%) rename LEGO1/{ => lego/legoomni/src/infocenter}/score.cpp (100%) rename LEGO1/{ => lego/legoomni/src/infocenter}/scorestate.cpp (100%) rename LEGO1/{ => lego/legoomni/src/input}/legoinputmanager.cpp (100%) rename LEGO1/{ => lego/legoomni/src/isle}/beachhouseentity.cpp (100%) rename LEGO1/{ => lego/legoomni/src/isle}/bike.cpp (100%) rename LEGO1/{ => lego/legoomni/src/isle}/bumpbouy.cpp (100%) rename LEGO1/{ => lego/legoomni/src/isle}/historybook.cpp (100%) rename LEGO1/{ => lego/legoomni/src/isle}/isle.cpp (100%) rename LEGO1/{ => lego/legoomni/src/isle}/isleactor.cpp (100%) rename LEGO1/{ => lego/legoomni/src/isle}/islepathactor.cpp (100%) rename LEGO1/{ => lego/legoomni/src/isle}/jukebox.cpp (100%) rename LEGO1/{ => lego/legoomni/src/isle}/jukeboxentity.cpp (100%) rename LEGO1/{ => lego/legoomni/src/isle}/jukeboxstate.cpp (100%) rename LEGO1/{ => lego/legoomni/src/isle}/motorcycle.cpp (100%) rename LEGO1/{ => lego/legoomni/src/isle}/radio.cpp (100%) rename LEGO1/{ => lego/legoomni/src/isle}/radiostate.cpp (100%) rename LEGO1/{ => lego/legoomni/src/isle}/skateboard.cpp (100%) rename LEGO1/{ => lego/legoomni/src/main}/legoomni.cpp (100%) rename LEGO1/{ => lego/legoomni/src/notify}/legoeventnotificationparam.cpp (100%) rename LEGO1/{ => lego/legoomni/src/paths}/legopathcontroller.cpp (100%) rename LEGO1/{ => lego/legoomni/src/paths}/legopathpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/pizzeria}/pizza.cpp (100%) rename LEGO1/{ => lego/legoomni/src/pizzeria}/pizzamissionstate.cpp (100%) rename LEGO1/{ => lego/legoomni/src/pizzeria}/pizzeria.cpp (100%) rename LEGO1/{ => lego/legoomni/src/pizzeria}/pizzeriastate.cpp (100%) rename LEGO1/{ => lego/legoomni/src/police}/police.cpp (100%) rename LEGO1/{ => lego/legoomni/src/police}/policeentity.cpp (100%) rename LEGO1/{ => lego/legoomni/src/police}/policestate.cpp (100%) rename LEGO1/{ => lego/legoomni/src/race}/carrace.cpp (100%) rename LEGO1/{ => lego/legoomni/src/race}/jetskirace.cpp (100%) rename LEGO1/{ => lego/legoomni/src/race}/racestandsentity.cpp (100%) rename LEGO1/{ => lego/legoomni/src/race}/racestate.cpp (100%) rename LEGO1/{ => lego/legoomni/src/towtrack}/towtrack.cpp (100%) rename LEGO1/{ => lego/legoomni/src/towtrack}/towtrackmissionstate.cpp (100%) create mode 100644 LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp rename LEGO1/{ => lego/legoomni/src/video}/legoanimationmanager.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legoanimmmpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legoanimpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legocarbuildanimpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legoflctexturepresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legohideanimpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legolocomotionanimpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legometerpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legomodelpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legopalettepresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legopartpresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legophonemepresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legotexturepresenter.cpp (100%) rename LEGO1/{ => lego/legoomni/src/video}/legovideomanager.cpp (99%) rename LEGO1/{ => lego/sources}/3dmanager/lego3dmanager.cpp (98%) rename LEGO1/{ => lego/sources}/3dmanager/lego3dmanager.h (100%) rename LEGO1/{ => lego/sources}/3dmanager/lego3dview.cpp (99%) rename LEGO1/{ => lego/sources}/3dmanager/lego3dview.h (100%) rename LEGO1/{ => lego/sources}/3dmanager/legoview1.cpp (99%) rename LEGO1/{ => lego/sources}/3dmanager/legoview1.h (100%) rename LEGO1/{ => lego/sources}/3dmanager/tglsurface.cpp (100%) rename LEGO1/{ => lego/sources}/3dmanager/tglsurface.h (97%) rename LEGO1/{ => lego/sources/roi}/legoroi.cpp (100%) rename LEGO1/{ => lego/sources/roi}/legoroi.h (100%) delete mode 100644 LEGO1/mxparam.cpp delete mode 100644 LEGO1/mxunknown100d7c88.cpp delete mode 100644 LEGO1/mxunknown100d9d00.h rename LEGO1/{ => omni/include}/mxactionnotificationparam.h (100%) rename LEGO1/{ => omni/include}/mxatomid.h (100%) rename LEGO1/{ => omni/include}/mxatomidcounter.h (100%) rename LEGO1/{ => omni/include}/mxaudiomanager.h (100%) rename LEGO1/{ => omni/include}/mxaudiopresenter.h (100%) rename LEGO1/{ => omni/include}/mxautolocker.h (100%) rename LEGO1/{ => omni/include}/mxbackgroundaudiomanager.h (100%) rename LEGO1/{ => omni/include}/mxbitmap.h (100%) rename LEGO1/{ => omni/include}/mxcollection.h (100%) rename LEGO1/{ => omni/include}/mxcompositemediapresenter.h (100%) rename LEGO1/{ => omni/include}/mxcompositepresenter.h (100%) rename LEGO1/{ => omni/include}/mxcontrolpresenter.h (100%) rename LEGO1/{ => omni/include}/mxcore.h (100%) rename LEGO1/{ => omni/include}/mxcriticalsection.h (100%) rename LEGO1/{ => omni/include}/mxdiskstreamcontroller.h (100%) rename LEGO1/{ => omni/include}/mxdiskstreamprovider.h (100%) rename LEGO1/{ => omni/include}/mxdisplaysurface.h (100%) rename LEGO1/{ => omni/include}/mxdsaction.h (100%) rename LEGO1/{ => omni/include}/mxdsactionlist.h (100%) rename LEGO1/{ => omni/include}/mxdsanim.h (100%) rename LEGO1/{ => omni/include}/mxdsbuffer.h (100%) rename LEGO1/{ => omni/include}/mxdschunk.h (100%) rename LEGO1/{ => omni/include}/mxdsevent.h (100%) rename LEGO1/{ => omni/include}/mxdsfile.h (100%) rename LEGO1/{ => omni/include}/mxdsmediaaction.h (100%) rename LEGO1/{ => omni/include}/mxdsmultiaction.h (100%) rename LEGO1/{ => omni/include}/mxdsobject.h (100%) rename LEGO1/{ => omni/include}/mxdsobjectaction.h (100%) rename LEGO1/{ => omni/include}/mxdsparallelaction.h (100%) rename LEGO1/{ => omni/include}/mxdsselectaction.h (100%) rename LEGO1/{ => omni/include}/mxdsserialaction.h (100%) rename LEGO1/{ => omni/include}/mxdssound.h (100%) rename LEGO1/{ => omni/include}/mxdssource.h (100%) rename LEGO1/{ => omni/include}/mxdsstill.h (100%) rename LEGO1/{ => omni/include}/mxdsstreamingaction.h (100%) rename LEGO1/{ => omni/include}/mxdssubscriber.h (100%) rename LEGO1/{ => omni/include}/mxdstypes.h (100%) mode change 100755 => 100644 rename LEGO1/{ => omni/include}/mxentity.h (100%) rename LEGO1/{ => omni/include}/mxeventmanager.h (100%) rename LEGO1/{ => omni/include}/mxeventpresenter.h (100%) rename LEGO1/{ => omni/include}/mxflcpresenter.h (100%) rename LEGO1/{ => omni/include}/mxhashtable.h (100%) rename LEGO1/{ => omni/include}/mxioinfo.h (100%) rename LEGO1/{ => omni/include}/mxlist.h (100%) rename LEGO1/{ => omni/include}/mxloopingflcpresenter.h (100%) rename LEGO1/{ => omni/include}/mxloopingmidipresenter.h (100%) rename LEGO1/{ => omni/include}/mxloopingsmkpresenter.h (100%) rename LEGO1/{ => omni/include}/mxmediamanager.h (100%) rename LEGO1/{ => omni/include}/mxmediapresenter.h (100%) rename LEGO1/{ => omni/include}/mxmidipresenter.h (100%) rename LEGO1/{ => omni/include}/mxmusicmanager.h (100%) rename LEGO1/{ => omni/include}/mxmusicpresenter.h (100%) rename LEGO1/{ => omni/include}/mxnextactiondatastart.h (100%) rename LEGO1/{ => omni/include}/mxnotificationmanager.h (100%) rename LEGO1/{ => omni/include}/mxnotificationparam.h (100%) rename LEGO1/{ => omni/include}/mxobjectfactory.h (100%) rename LEGO1/{ => omni/include}/mxomni.h (100%) rename LEGO1/{ => omni/include}/mxomnicreateflags.h (100%) rename LEGO1/{ => omni/include}/mxomnicreateparam.h (100%) rename LEGO1/{ => omni/include}/mxpalette.h (100%) rename LEGO1/{ => omni/include}/mxparam.h (100%) rename LEGO1/{ => omni/include}/mxpoint32.h (100%) mode change 100755 => 100644 rename LEGO1/{ => omni/include}/mxpresenter.h (100%) rename LEGO1/{ => omni/include}/mxpresenterlist.h (100%) rename LEGO1/{ => omni/include}/mxqueue.h (100%) rename LEGO1/{ => omni/include}/mxramstreamcontroller.h (100%) rename LEGO1/{ => omni/include}/mxramstreamprovider.h (100%) rename LEGO1/{ => omni/include}/mxrect32.h (100%) rename LEGO1/{ => omni/include}/mxrectlist.h (100%) rename LEGO1/{ => omni/include}/mxregion.h (100%) rename LEGO1/{ => omni/include}/mxregioncursor.h (100%) rename LEGO1/{ => omni/include}/mxregionlist.h (100%) rename LEGO1/{ => omni/include}/mxscheduler.h (100%) rename LEGO1/{ => omni/include}/mxsemaphore.h (100%) rename LEGO1/{ => omni/include}/mxsize32.h (100%) rename LEGO1/{ => omni/include}/mxsmack.h (100%) rename LEGO1/{ => omni/include}/mxsmkpresenter.h (100%) rename LEGO1/{ => omni/include}/mxsoundmanager.h (100%) rename LEGO1/{ => omni/include}/mxsoundpresenter.h (100%) rename LEGO1/{ => omni/include}/mxstillpresenter.h (100%) rename LEGO1/{ => omni/include}/mxstreamchunk.h (100%) rename LEGO1/{ => omni/include}/mxstreamchunklist.h (100%) rename LEGO1/{ => omni/include}/mxstreamcontroller.h (100%) rename LEGO1/{ => omni/include}/mxstreamer.h (100%) rename LEGO1/{ => omni/include}/mxstreamlist.h (100%) rename LEGO1/{ => omni/include}/mxstreamprovider.h (100%) rename LEGO1/{ => omni/include}/mxstring.h (100%) rename LEGO1/{ => omni/include}/mxstringlist.h (100%) rename LEGO1/{ => omni/include}/mxthread.h (100%) rename LEGO1/{ => omni/include}/mxticklemanager.h (100%) rename LEGO1/{ => omni/include}/mxtimer.h (100%) rename LEGO1/{ => omni/include}/mxtransitionmanager.h (100%) rename LEGO1/{ => omni/include}/mxtype17notificationparam.h (100%) rename LEGO1/{ => omni/include}/mxtype18notificationparam.h (100%) rename LEGO1/{ => omni/include}/mxtype19notificationparam.h (100%) rename LEGO1/{ => omni/include}/mxtypes.h (100%) rename LEGO1/{ => omni/include}/mxvariable.h (100%) rename LEGO1/{ => omni/include}/mxvariabletable.h (100%) rename LEGO1/{ => omni/include}/mxvideomanager.h (100%) rename LEGO1/{ => omni/include}/mxvideoparam.h (100%) rename LEGO1/{ => omni/include}/mxvideoparamflags.h (100%) rename LEGO1/{ => omni/include}/mxvideopresenter.h (100%) rename LEGO1/{ => omni/include}/mxwavepresenter.h (100%) rename LEGO1/{ => omni/src/action}/mxdsaction.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsanim.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsevent.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsmediaaction.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsmultiaction.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsobject.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsobjectaction.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsparallelaction.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsselectaction.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsserialaction.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdssound.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsstill.cpp (100%) rename LEGO1/{ => omni/src/action}/mxdsstreamingaction.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxaudiomanager.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxaudiopresenter.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxbackgroundaudiomanager.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxloopingmidipresenter.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxmidipresenter.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxmusicmanager.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxmusicpresenter.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxsoundmanager.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxsoundpresenter.cpp (100%) rename LEGO1/{ => omni/src/audio}/mxwavepresenter.cpp (100%) rename LEGO1/{ => omni/src/common}/mxatomid.cpp (100%) rename LEGO1/{ => omni/src/common}/mxatomidcounter.cpp (100%) rename LEGO1/{ => omni/src/common}/mxcompositemediapresenter.cpp (100%) rename LEGO1/{ => omni/src/common}/mxcompositepresenter.cpp (100%) rename LEGO1/{ => omni/src/common}/mxcore.cpp (100%) rename LEGO1/{ => omni/src/common}/mxmediamanager.cpp (100%) rename LEGO1/{ => omni/src/common}/mxmediapresenter.cpp (100%) rename LEGO1/{ => omni/src/common}/mxobjectfactory.cpp (100%) rename LEGO1/{ => omni/src/common}/mxpresenter.cpp (100%) rename LEGO1/{ => omni/src/common}/mxstring.cpp (100%) rename LEGO1/{ => omni/src/common}/mxticklemanager.cpp (100%) rename LEGO1/{ => omni/src/common}/mxtimer.cpp (100%) rename LEGO1/{ => omni/src/common}/mxvariable.cpp (100%) rename LEGO1/{ => omni/src/common}/mxvariabletable.cpp (100%) rename LEGO1/{ => omni/src/control}/mxcontrolpresenter.cpp (100%) rename LEGO1/{ => omni/src/entity}/mxentity.cpp (100%) rename LEGO1/{ => omni/src/event}/mxeventmanager.cpp (100%) rename LEGO1/{ => omni/src/event}/mxeventpresenter.cpp (100%) rename LEGO1/{dllmain.cpp => omni/src/main/mxmain.cpp} (100%) rename LEGO1/{ => omni/src/main}/mxomni.cpp (100%) rename LEGO1/{ => omni/src/main}/mxomnicreateflags.cpp (100%) rename LEGO1/{ => omni/src/main}/mxomnicreateparam.cpp (100%) rename LEGO1/{ => omni/src/notify}/mxactionnotificationparam.cpp (100%) rename LEGO1/{ => omni/src/notify}/mxnotificationmanager.cpp (100%) rename LEGO1/{ => omni/src/notify}/mxnotificationparam.cpp (100%) rename LEGO1/{ => omni/src/notify}/mxtype17notificationparam.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxdiskstreamcontroller.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxdiskstreamprovider.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxdsbuffer.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxdschunk.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxdsfile.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxdssource.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxdssubscriber.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxioinfo.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxramstreamcontroller.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxramstreamprovider.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxstreamchunk.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxstreamcontroller.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxstreamer.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxstreamlist.cpp (100%) rename LEGO1/{ => omni/src/stream}/mxstreamprovider.cpp (100%) rename LEGO1/{ => omni/src/system}/mxautolocker.cpp (100%) rename LEGO1/{ => omni/src/system}/mxcriticalsection.cpp (100%) rename LEGO1/{ => omni/src/system}/mxscheduler.cpp (100%) rename LEGO1/{ => omni/src/system}/mxsemaphore.cpp (100%) rename LEGO1/{ => omni/src/system}/mxthread.cpp (100%) rename LEGO1/{ => omni/src/video}/mxbitmap.cpp (100%) rename LEGO1/{ => omni/src/video}/mxdisplaysurface.cpp (100%) rename LEGO1/{ => omni/src/video}/mxflcpresenter.cpp (100%) rename LEGO1/{ => omni/src/video}/mxloopingflcpresenter.cpp (100%) rename LEGO1/{ => omni/src/video}/mxloopingsmkpresenter.cpp (100%) rename LEGO1/{ => omni/src/video}/mxpalette.cpp (100%) rename LEGO1/{ => omni/src/video}/mxregion.cpp (100%) rename LEGO1/{ => omni/src/video}/mxregioncursor.cpp (100%) rename LEGO1/{ => omni/src/video}/mxsmack.cpp (100%) rename LEGO1/{ => omni/src/video}/mxsmkpresenter.cpp (100%) rename LEGO1/{ => omni/src/video}/mxstillpresenter.cpp (100%) rename LEGO1/{ => omni/src/video}/mxtransitionmanager.cpp (100%) rename LEGO1/{ => omni/src/video}/mxvideomanager.cpp (100%) rename LEGO1/{ => omni/src/video}/mxvideoparam.cpp (100%) rename LEGO1/{ => omni/src/video}/mxvideoparamflags.cpp (100%) rename LEGO1/{ => omni/src/video}/mxvideopresenter.cpp (100%) diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index aaa41235..07b646fb 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -11,19 +11,12 @@ jobs: - name: Run clang-format run: | + find LEGO1 ISLE -iname '*.h' -o -iname '*.cpp' | xargs \ pipx run "clang-format>=17,<18" \ --Werror \ --dry-run \ --style=file \ - ISLE/*.cpp ISLE/*.h \ - LEGO1/*.cpp LEGO1/*.h \ - LEGO1/3dmanager/*.cpp LEGO1/3dmanager/*.h \ - LEGO1/mxdirectx/*.cpp LEGO1/mxdirectx/*.h \ - LEGO1/mxstl/*.h \ - LEGO1/realtime/*.cpp LEGO1/realtime/*.h \ - LEGO1/tgl/*.h \ - LEGO1/tgl/d3drm/*.cpp LEGO1/tgl/d3drm/*.h \ - LEGO1/viewmanager/*.cpp LEGO1/viewmanager/*.h + -i python-format: runs-on: ubuntu-latest diff --git a/.github/workflows/naming.yml b/.github/workflows/naming.yml index c870d7dd..163354d5 100644 --- a/.github/workflows/naming.yml +++ b/.github/workflows/naming.yml @@ -22,8 +22,14 @@ jobs: run: | python3 tools/ncc/ncc.py \ --clang-lib ${{ env.LLVM_PATH }}/lib/libclang.so \ + --recurse \ --style tools/ncc/ncc.style \ --skip tools/ncc/skip.yml \ --definition WINAPI FAR BOOL CALLBACK HWND__=HWND \ - --include util \ - --path LEGO1 + --include \ + util \ + LEGO1 \ + LEGO1/omni/include \ + LEGO1/lego/legoomni/include \ + LEGO1/lego/sources \ + --path LEGO1/omni LEGO1/lego/legoomni diff --git a/.gitignore b/.gitignore index 72d6fef6..7e16a6ce 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ env.bak/ venv.bak/ ISLE.EXE LEGO1.DLL -build/ +/build/ *.swp LEGO1PROGRESS.* ISLEPROGRESS.* diff --git a/3rdparty/smack/rad.h b/3rdparty/smacker/rad.h similarity index 100% rename from 3rdparty/smack/rad.h rename to 3rdparty/smacker/rad.h diff --git a/3rdparty/smack/smack.h b/3rdparty/smacker/smack.h similarity index 100% rename from 3rdparty/smack/smack.h rename to 3rdparty/smacker/smack.h diff --git a/3rdparty/smack/smack.lib b/3rdparty/smacker/smack.lib similarity index 100% rename from 3rdparty/smack/smack.lib rename to 3rdparty/smacker/smack.lib diff --git a/CMakeLists.txt b/CMakeLists.txt index f0e3eae5..10f30c5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,212 +7,210 @@ option(ISLE_USE_SMARTHEAP "Build with SmartHeap" ${MSVC}) option(ISLE_USE_DX5 "Build with internal DirectX 5 SDK" ON) add_library(lego1 SHARED - LEGO1/3dmanager/lego3dmanager.cpp - LEGO1/3dmanager/lego3dview.cpp - LEGO1/3dmanager/legoview1.cpp - LEGO1/3dmanager/tglsurface.cpp - LEGO1/act1state.cpp - LEGO1/act2brick.cpp - LEGO1/act2policestation.cpp - LEGO1/act3.cpp - LEGO1/act3shark.cpp - LEGO1/act3state.cpp - LEGO1/ambulance.cpp - LEGO1/ambulancemissionstate.cpp - LEGO1/animstate.cpp - LEGO1/beachhouseentity.cpp - LEGO1/bike.cpp - LEGO1/buildingentity.cpp - LEGO1/bumpbouy.cpp - LEGO1/carrace.cpp LEGO1/define.cpp - LEGO1/dllmain.cpp - LEGO1/dunebuggy.cpp - LEGO1/elevatorbottom.cpp - LEGO1/gasstation.cpp - LEGO1/gasstationentity.cpp - LEGO1/gasstationstate.cpp - LEGO1/gifmanager.cpp - LEGO1/helicopter.cpp - LEGO1/helicopterstate.cpp - LEGO1/historybook.cpp - LEGO1/hospital.cpp - LEGO1/hospitalentity.cpp - LEGO1/hospitalstate.cpp - LEGO1/infocenter.cpp - LEGO1/infocenterdoor.cpp - LEGO1/infocenterentity.cpp - LEGO1/infocenterstate.cpp - LEGO1/isle.cpp - LEGO1/isleactor.cpp - LEGO1/islepathactor.cpp - LEGO1/jetski.cpp - LEGO1/jetskirace.cpp - LEGO1/jukebox.cpp - LEGO1/jukeboxentity.cpp - LEGO1/jukeboxstate.cpp - LEGO1/legoact2state.cpp - LEGO1/legoactioncontrolpresenter.cpp - LEGO1/legoactor.cpp - LEGO1/legoactor.cpp - LEGO1/legoanimactor.cpp - LEGO1/legoanimationmanager.cpp - LEGO1/legoanimmmpresenter.cpp - LEGO1/legoanimpresenter.cpp - LEGO1/legobackgroundcolor.cpp - LEGO1/legobackgroundcolor.cpp - LEGO1/legobuildingmanager.cpp - LEGO1/legocachesound.cpp - LEGO1/legocameracontroller.cpp - LEGO1/legocarbuild.cpp - LEGO1/legocarbuildanimpresenter.cpp - LEGO1/legocontrolmanager.cpp - LEGO1/legoentity.cpp - LEGO1/legoentitypresenter.cpp - LEGO1/legoeventnotificationparam.cpp - LEGO1/legoflctexturepresenter.cpp - LEGO1/legofullscreenmovie.cpp - LEGO1/legogamestate.cpp - LEGO1/legohideanimpresenter.cpp - LEGO1/legoinputmanager.cpp - LEGO1/legojetski.cpp - LEGO1/legoloadcachesoundpresenter.cpp - LEGO1/legolocomotionanimpresenter.cpp - LEGO1/legometerpresenter.cpp - LEGO1/legomodelpresenter.cpp - LEGO1/legonavcontroller.cpp - LEGO1/legoobjectfactory.cpp - LEGO1/legoomni.cpp - LEGO1/legopalettepresenter.cpp - LEGO1/legopartpresenter.cpp - LEGO1/legopathactor.cpp - LEGO1/legopathcontroller.cpp - LEGO1/legopathpresenter.cpp - LEGO1/legophonemepresenter.cpp - LEGO1/legoplantmanager.cpp - LEGO1/legorace.cpp - LEGO1/legoroi.cpp - LEGO1/legosoundmanager.cpp - LEGO1/legostate.cpp - LEGO1/legostream.cpp - LEGO1/legotexturepresenter.cpp - LEGO1/legoutil.cpp - LEGO1/legounksavedatawriter.cpp - LEGO1/legovehiclebuildstate.cpp - LEGO1/legovideomanager.cpp - LEGO1/legoworld.cpp - LEGO1/legoworldpresenter.cpp - LEGO1/motorcycle.cpp - LEGO1/mxactionnotificationparam.cpp - LEGO1/mxatomid.cpp - LEGO1/mxatomidcounter.cpp - LEGO1/mxaudiomanager.cpp - LEGO1/mxaudiopresenter.cpp - LEGO1/mxautolocker.cpp - LEGO1/mxbackgroundaudiomanager.cpp - LEGO1/mxbitmap.cpp - LEGO1/mxcompositemediapresenter.cpp - LEGO1/mxcompositepresenter.cpp - LEGO1/mxcontrolpresenter.cpp - LEGO1/mxcore.cpp - LEGO1/mxcriticalsection.cpp + LEGO1/lego/legoomni/src/act1/act1state.cpp + LEGO1/lego/legoomni/src/act2/act2brick.cpp + LEGO1/lego/legoomni/src/act2/act2policestation.cpp + LEGO1/lego/legoomni/src/act2/legoact2state.cpp + LEGO1/lego/legoomni/src/act3/act3.cpp + LEGO1/lego/legoomni/src/act3/act3shark.cpp + LEGO1/lego/legoomni/src/act3/act3state.cpp + LEGO1/lego/legoomni/src/audio/legocachesound.cpp + LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp + LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp + LEGO1/lego/legoomni/src/build/buildingentity.cpp + LEGO1/lego/legoomni/src/build/dunebuggy.cpp + LEGO1/lego/legoomni/src/build/helicopter.cpp + LEGO1/lego/legoomni/src/build/helicopterstate.cpp + LEGO1/lego/legoomni/src/build/jetski.cpp + LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp + LEGO1/lego/legoomni/src/build/legocarbuild.cpp + LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp + LEGO1/lego/legoomni/src/build/racecar.cpp + LEGO1/lego/legoomni/src/common/animstate.cpp + LEGO1/lego/legoomni/src/common/gifmanager.cpp + LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp + LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp + LEGO1/lego/legoomni/src/common/legocameracontroller.cpp + LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp + LEGO1/lego/legoomni/src/common/legogamestate.cpp + LEGO1/lego/legoomni/src/common/legonavcontroller.cpp + LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp + LEGO1/lego/legoomni/src/common/legoplantmanager.cpp + LEGO1/lego/legoomni/src/common/legostate.cpp + LEGO1/lego/legoomni/src/common/legostream.cpp + LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp + LEGO1/lego/legoomni/src/common/legoutil.cpp + LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp + LEGO1/lego/legoomni/src/entity/legoactor.cpp + LEGO1/lego/legoomni/src/entity/legoanimactor.cpp + LEGO1/lego/legoomni/src/entity/legoentity.cpp + LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp + LEGO1/lego/legoomni/src/entity/legojetski.cpp + LEGO1/lego/legoomni/src/entity/legopathactor.cpp + LEGO1/lego/legoomni/src/entity/legorace.cpp + LEGO1/lego/legoomni/src/entity/legoworld.cpp + LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp + LEGO1/lego/legoomni/src/gasstation/gasstation.cpp + LEGO1/lego/legoomni/src/gasstation/gasstationentity.cpp + LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp + LEGO1/lego/legoomni/src/hospital/ambulance.cpp + LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp + LEGO1/lego/legoomni/src/hospital/hospital.cpp + LEGO1/lego/legoomni/src/hospital/hospitalentity.cpp + LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp + LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp + LEGO1/lego/legoomni/src/infocenter/infocenter.cpp + LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp + LEGO1/lego/legoomni/src/infocenter/infocenterentity.cpp + LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp + LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp + LEGO1/lego/legoomni/src/infocenter/score.cpp + LEGO1/lego/legoomni/src/infocenter/scorestate.cpp + LEGO1/lego/legoomni/src/input/legoinputmanager.cpp + LEGO1/lego/legoomni/src/isle/beachhouseentity.cpp + LEGO1/lego/legoomni/src/isle/bike.cpp + LEGO1/lego/legoomni/src/isle/bumpbouy.cpp + LEGO1/lego/legoomni/src/isle/historybook.cpp + LEGO1/lego/legoomni/src/isle/isleactor.cpp + LEGO1/lego/legoomni/src/isle/isle.cpp + LEGO1/lego/legoomni/src/isle/islepathactor.cpp + LEGO1/lego/legoomni/src/isle/jukebox.cpp + LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp + LEGO1/lego/legoomni/src/isle/jukeboxstate.cpp + LEGO1/lego/legoomni/src/isle/motorcycle.cpp + LEGO1/lego/legoomni/src/isle/radio.cpp + LEGO1/lego/legoomni/src/isle/radiostate.cpp + LEGO1/lego/legoomni/src/isle/skateboard.cpp + LEGO1/lego/legoomni/src/main/legoomni.cpp + LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp + LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp + LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp + LEGO1/lego/legoomni/src/pizzeria/pizza.cpp + LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp + LEGO1/lego/legoomni/src/pizzeria/pizzeria.cpp + LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp + LEGO1/lego/legoomni/src/police/police.cpp + LEGO1/lego/legoomni/src/police/policeentity.cpp + LEGO1/lego/legoomni/src/police/policestate.cpp + LEGO1/lego/legoomni/src/race/carrace.cpp + LEGO1/lego/legoomni/src/race/jetskirace.cpp + LEGO1/lego/legoomni/src/race/racestandsentity.cpp + LEGO1/lego/legoomni/src/race/racestate.cpp + LEGO1/lego/legoomni/src/towtrack/towtrack.cpp + LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp + LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp + LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp + LEGO1/lego/legoomni/src/video/legoanimmmpresenter.cpp + LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp + LEGO1/lego/legoomni/src/video/legocarbuildanimpresenter.cpp + LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp + LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp + LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp + LEGO1/lego/legoomni/src/video/legometerpresenter.cpp + LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp + LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp + LEGO1/lego/legoomni/src/video/legopartpresenter.cpp + LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp + LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp + LEGO1/lego/legoomni/src/video/legovideomanager.cpp + LEGO1/lego/sources/3dmanager/lego3dmanager.cpp + LEGO1/lego/sources/3dmanager/lego3dview.cpp + LEGO1/lego/sources/3dmanager/legoview1.cpp + LEGO1/lego/sources/3dmanager/tglsurface.cpp + LEGO1/lego/sources/roi/legoroi.cpp LEGO1/mxdirectx/mxdirect3d.cpp LEGO1/mxdirectx/mxdirectdraw.cpp - LEGO1/mxdiskstreamcontroller.cpp - LEGO1/mxdiskstreamprovider.cpp - LEGO1/mxdisplaysurface.cpp - LEGO1/mxdsaction.cpp - LEGO1/mxdsanim.cpp - LEGO1/mxdsbuffer.cpp - LEGO1/mxdschunk.cpp - LEGO1/mxdsevent.cpp - LEGO1/mxdsfile.cpp - LEGO1/mxdsmediaaction.cpp - LEGO1/mxdsmultiaction.cpp - LEGO1/mxdsobject.cpp - LEGO1/mxdsobjectaction.cpp - LEGO1/mxdsparallelaction.cpp - LEGO1/mxdsselectaction.cpp - LEGO1/mxdsserialaction.cpp - LEGO1/mxdssound.cpp - LEGO1/mxdssource.cpp - LEGO1/mxdsstill.cpp - LEGO1/mxdsstreamingaction.cpp - LEGO1/mxdssubscriber.cpp - LEGO1/mxentity.cpp - LEGO1/mxeventmanager.cpp - LEGO1/mxeventpresenter.cpp - LEGO1/mxflcpresenter.cpp - LEGO1/mxioinfo.cpp - LEGO1/mxloopingflcpresenter.cpp - LEGO1/mxloopingmidipresenter.cpp - LEGO1/mxloopingsmkpresenter.cpp - LEGO1/mxmediamanager.cpp - LEGO1/mxmediapresenter.cpp - LEGO1/mxmidipresenter.cpp - LEGO1/mxmusicmanager.cpp - LEGO1/mxmusicpresenter.cpp - LEGO1/mxnotificationmanager.cpp - LEGO1/mxnotificationparam.cpp - LEGO1/mxobjectfactory.cpp - LEGO1/mxomni.cpp - LEGO1/mxomnicreateflags.cpp - LEGO1/mxomnicreateparam.cpp - LEGO1/mxpalette.cpp - LEGO1/mxparam.cpp - LEGO1/mxpresenter.cpp - LEGO1/mxramstreamcontroller.cpp - LEGO1/mxramstreamprovider.cpp - LEGO1/mxregion.cpp - LEGO1/mxregioncursor.cpp - LEGO1/mxscheduler.cpp - LEGO1/mxsemaphore.cpp - LEGO1/mxsmack.cpp - LEGO1/mxsmkpresenter.cpp - LEGO1/mxsoundmanager.cpp - LEGO1/mxsoundpresenter.cpp - LEGO1/mxstillpresenter.cpp - LEGO1/mxstreamchunk.cpp - LEGO1/mxstreamcontroller.cpp - LEGO1/mxstreamer.cpp - LEGO1/mxstreamlist.cpp - LEGO1/mxstreamprovider.cpp - LEGO1/mxstring.cpp - LEGO1/mxthread.cpp - LEGO1/mxticklemanager.cpp - LEGO1/mxtimer.cpp - LEGO1/mxtransitionmanager.cpp - LEGO1/mxtype17notificationparam.cpp - LEGO1/mxunknown100d7c88.cpp - LEGO1/mxvariable.cpp - LEGO1/mxvariabletable.cpp - LEGO1/mxvideomanager.cpp - LEGO1/mxvideoparam.cpp - LEGO1/mxvideoparamflags.cpp - LEGO1/mxvideopresenter.cpp - LEGO1/mxwavepresenter.cpp - LEGO1/pizza.cpp - LEGO1/pizzamissionstate.cpp - LEGO1/pizzeria.cpp - LEGO1/pizzeriastate.cpp - LEGO1/police.cpp - LEGO1/policeentity.cpp - LEGO1/policestate.cpp - LEGO1/racecar.cpp - LEGO1/racestandsentity.cpp - LEGO1/racestate.cpp - LEGO1/radio.cpp - LEGO1/radiostate.cpp + LEGO1/omni/src/action/mxdsaction.cpp + LEGO1/omni/src/action/mxdsanim.cpp + LEGO1/omni/src/action/mxdsevent.cpp + LEGO1/omni/src/action/mxdsmediaaction.cpp + LEGO1/omni/src/action/mxdsmultiaction.cpp + LEGO1/omni/src/action/mxdsobjectaction.cpp + LEGO1/omni/src/action/mxdsobject.cpp + LEGO1/omni/src/action/mxdsparallelaction.cpp + LEGO1/omni/src/action/mxdsselectaction.cpp + LEGO1/omni/src/action/mxdsserialaction.cpp + LEGO1/omni/src/action/mxdssound.cpp + LEGO1/omni/src/action/mxdsstill.cpp + LEGO1/omni/src/action/mxdsstreamingaction.cpp + LEGO1/omni/src/audio/mxaudiomanager.cpp + LEGO1/omni/src/audio/mxaudiopresenter.cpp + LEGO1/omni/src/audio/mxbackgroundaudiomanager.cpp + LEGO1/omni/src/audio/mxloopingmidipresenter.cpp + LEGO1/omni/src/audio/mxmidipresenter.cpp + LEGO1/omni/src/audio/mxmusicmanager.cpp + LEGO1/omni/src/audio/mxmusicpresenter.cpp + LEGO1/omni/src/audio/mxsoundmanager.cpp + LEGO1/omni/src/audio/mxsoundpresenter.cpp + LEGO1/omni/src/audio/mxwavepresenter.cpp + LEGO1/omni/src/common/mxatomidcounter.cpp + LEGO1/omni/src/common/mxatomid.cpp + LEGO1/omni/src/common/mxcompositemediapresenter.cpp + LEGO1/omni/src/common/mxcompositepresenter.cpp + LEGO1/omni/src/common/mxcore.cpp + LEGO1/omni/src/common/mxmediamanager.cpp + LEGO1/omni/src/common/mxmediapresenter.cpp + LEGO1/omni/src/common/mxobjectfactory.cpp + LEGO1/omni/src/common/mxpresenter.cpp + LEGO1/omni/src/common/mxstring.cpp + LEGO1/omni/src/common/mxticklemanager.cpp + LEGO1/omni/src/common/mxtimer.cpp + LEGO1/omni/src/common/mxvariable.cpp + LEGO1/omni/src/common/mxvariabletable.cpp + LEGO1/omni/src/control/mxcontrolpresenter.cpp + LEGO1/omni/src/entity/mxentity.cpp + LEGO1/omni/src/event/mxeventmanager.cpp + LEGO1/omni/src/event/mxeventpresenter.cpp + LEGO1/omni/src/main/mxmain.cpp + LEGO1/omni/src/main/mxomni.cpp + LEGO1/omni/src/main/mxomnicreateflags.cpp + LEGO1/omni/src/main/mxomnicreateparam.cpp + LEGO1/omni/src/notify/mxactionnotificationparam.cpp + LEGO1/omni/src/notify/mxnotificationmanager.cpp + LEGO1/omni/src/notify/mxnotificationparam.cpp + LEGO1/omni/src/notify/mxtype17notificationparam.cpp + LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp + LEGO1/omni/src/stream/mxdiskstreamprovider.cpp + LEGO1/omni/src/stream/mxdsbuffer.cpp + LEGO1/omni/src/stream/mxdschunk.cpp + LEGO1/omni/src/stream/mxdsfile.cpp + LEGO1/omni/src/stream/mxdssource.cpp + LEGO1/omni/src/stream/mxdssubscriber.cpp + LEGO1/omni/src/stream/mxioinfo.cpp + LEGO1/omni/src/stream/mxramstreamcontroller.cpp + LEGO1/omni/src/stream/mxramstreamprovider.cpp + LEGO1/omni/src/stream/mxstreamchunk.cpp + LEGO1/omni/src/stream/mxstreamcontroller.cpp + LEGO1/omni/src/stream/mxstreamer.cpp + LEGO1/omni/src/stream/mxstreamlist.cpp + LEGO1/omni/src/stream/mxstreamprovider.cpp + LEGO1/omni/src/system/mxautolocker.cpp + LEGO1/omni/src/system/mxcriticalsection.cpp + LEGO1/omni/src/system/mxscheduler.cpp + LEGO1/omni/src/system/mxsemaphore.cpp + LEGO1/omni/src/system/mxthread.cpp + LEGO1/omni/src/video/mxbitmap.cpp + LEGO1/omni/src/video/mxdisplaysurface.cpp + LEGO1/omni/src/video/mxflcpresenter.cpp + LEGO1/omni/src/video/mxloopingflcpresenter.cpp + LEGO1/omni/src/video/mxloopingsmkpresenter.cpp + LEGO1/omni/src/video/mxpalette.cpp + LEGO1/omni/src/video/mxregion.cpp + LEGO1/omni/src/video/mxregioncursor.cpp + LEGO1/omni/src/video/mxsmack.cpp + LEGO1/omni/src/video/mxsmkpresenter.cpp + LEGO1/omni/src/video/mxstillpresenter.cpp + LEGO1/omni/src/video/mxtransitionmanager.cpp + LEGO1/omni/src/video/mxvideomanager.cpp + LEGO1/omni/src/video/mxvideoparam.cpp + LEGO1/omni/src/video/mxvideoparamflags.cpp + LEGO1/omni/src/video/mxvideopresenter.cpp LEGO1/realtime/matrix.cpp LEGO1/realtime/orientableroi.cpp LEGO1/realtime/realtime.cpp LEGO1/realtime/realtimeview.cpp LEGO1/realtime/vector.cpp - LEGO1/registrationbook.cpp - LEGO1/res/lego1.rc - LEGO1/score.cpp - LEGO1/scorestate.cpp - LEGO1/skateboard.cpp LEGO1/tgl/d3drm/camera.cpp LEGO1/tgl/d3drm/device.cpp LEGO1/tgl/d3drm/group.cpp @@ -222,21 +220,25 @@ add_library(lego1 SHARED LEGO1/tgl/d3drm/texture.cpp LEGO1/tgl/d3drm/unk.cpp LEGO1/tgl/d3drm/view.cpp - LEGO1/towtrack.cpp - LEGO1/towtrackmissionstate.cpp LEGO1/viewmanager/viewlodlist.cpp LEGO1/viewmanager/viewmanager.cpp LEGO1/viewmanager/viewroi.cpp ) + if (MINGW) target_compile_definitions(lego1 PRIVATE DIRECTINPUT_VERSION=0x0500) endif() -# Additional include directories target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/util") +target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1") +target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include") +target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources") +target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include") + +# Additional include directories target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/3rdparty/vec") target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/flic") -target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smack") +target_include_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smacker") if (ISLE_USE_SMARTHEAP) add_library(SmartHeap::SmartHeap STATIC IMPORTED) @@ -254,7 +256,7 @@ if (ISLE_USE_DX5) target_link_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/dx5/lib") endif() -target_link_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smack") +target_link_directories(lego1 PRIVATE "${CMAKE_SOURCE_DIR}/3rdparty/smacker") # Link libraries target_link_libraries(lego1 PRIVATE ddraw dsound dinput dxguid winmm d3drm smack) @@ -272,9 +274,10 @@ if (ISLE_BUILD_APP) ) target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/util") - - # Include LEGO1 headers in ISLE target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1") + target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include") + target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources") + target_include_directories(isle PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include") # Use internal DirectX 5 if required if (ISLE_USE_DX5) diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index 12a3b6f7..d6f9c293 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -8,7 +8,6 @@ #include "legomodelpresenter.h" #include "legoomni.h" #include "legopartpresenter.h" -#include "legoroi.h" #include "legovideomanager.h" #include "legoworldpresenter.h" #include "mxbackgroundaudiomanager.h" diff --git a/ISLE/res/resource.h b/ISLE/res/resource.h index 6148e89f..647c616e 100644 --- a/ISLE/res/resource.h +++ b/ISLE/res/resource.h @@ -1,5 +1,5 @@ -#define ISLE_ARROW 102 -#define ISLE_NO 103 -#define ISLE_BUSY 104 +#define ISLE_ARROW 102 +#define ISLE_NO 103 +#define ISLE_BUSY 104 -#define APP_ICON 105 +#define APP_ICON 105 diff --git a/LEGO1/act1state.h b/LEGO1/lego/legoomni/include/act1state.h similarity index 100% rename from LEGO1/act1state.h rename to LEGO1/lego/legoomni/include/act1state.h diff --git a/LEGO1/act2brick.h b/LEGO1/lego/legoomni/include/act2brick.h similarity index 100% rename from LEGO1/act2brick.h rename to LEGO1/lego/legoomni/include/act2brick.h diff --git a/LEGO1/act2policestation.h b/LEGO1/lego/legoomni/include/act2policestation.h similarity index 100% rename from LEGO1/act2policestation.h rename to LEGO1/lego/legoomni/include/act2policestation.h diff --git a/LEGO1/act3.h b/LEGO1/lego/legoomni/include/act3.h similarity index 100% rename from LEGO1/act3.h rename to LEGO1/lego/legoomni/include/act3.h diff --git a/LEGO1/act3actor.h b/LEGO1/lego/legoomni/include/act3actor.h similarity index 100% rename from LEGO1/act3actor.h rename to LEGO1/lego/legoomni/include/act3actor.h diff --git a/LEGO1/act3shark.h b/LEGO1/lego/legoomni/include/act3shark.h similarity index 100% rename from LEGO1/act3shark.h rename to LEGO1/lego/legoomni/include/act3shark.h diff --git a/LEGO1/act3state.h b/LEGO1/lego/legoomni/include/act3state.h similarity index 100% rename from LEGO1/act3state.h rename to LEGO1/lego/legoomni/include/act3state.h diff --git a/LEGO1/ambulance.h b/LEGO1/lego/legoomni/include/ambulance.h similarity index 100% rename from LEGO1/ambulance.h rename to LEGO1/lego/legoomni/include/ambulance.h diff --git a/LEGO1/ambulancemissionstate.h b/LEGO1/lego/legoomni/include/ambulancemissionstate.h similarity index 100% rename from LEGO1/ambulancemissionstate.h rename to LEGO1/lego/legoomni/include/ambulancemissionstate.h diff --git a/LEGO1/animstate.h b/LEGO1/lego/legoomni/include/animstate.h similarity index 100% rename from LEGO1/animstate.h rename to LEGO1/lego/legoomni/include/animstate.h diff --git a/LEGO1/beachhouseentity.h b/LEGO1/lego/legoomni/include/beachhouseentity.h similarity index 100% rename from LEGO1/beachhouseentity.h rename to LEGO1/lego/legoomni/include/beachhouseentity.h diff --git a/LEGO1/bike.h b/LEGO1/lego/legoomni/include/bike.h similarity index 100% rename from LEGO1/bike.h rename to LEGO1/lego/legoomni/include/bike.h diff --git a/LEGO1/buildingentity.h b/LEGO1/lego/legoomni/include/buildingentity.h similarity index 100% rename from LEGO1/buildingentity.h rename to LEGO1/lego/legoomni/include/buildingentity.h diff --git a/LEGO1/bumpbouy.h b/LEGO1/lego/legoomni/include/bumpbouy.h similarity index 100% rename from LEGO1/bumpbouy.h rename to LEGO1/lego/legoomni/include/bumpbouy.h diff --git a/LEGO1/carrace.h b/LEGO1/lego/legoomni/include/carrace.h similarity index 100% rename from LEGO1/carrace.h rename to LEGO1/lego/legoomni/include/carrace.h diff --git a/LEGO1/carracestate.h b/LEGO1/lego/legoomni/include/carracestate.h similarity index 100% rename from LEGO1/carracestate.h rename to LEGO1/lego/legoomni/include/carracestate.h diff --git a/LEGO1/doors.h b/LEGO1/lego/legoomni/include/doors.h similarity index 100% rename from LEGO1/doors.h rename to LEGO1/lego/legoomni/include/doors.h diff --git a/LEGO1/dunebuggy.h b/LEGO1/lego/legoomni/include/dunebuggy.h similarity index 100% rename from LEGO1/dunebuggy.h rename to LEGO1/lego/legoomni/include/dunebuggy.h diff --git a/LEGO1/elevatorbottom.h b/LEGO1/lego/legoomni/include/elevatorbottom.h similarity index 100% rename from LEGO1/elevatorbottom.h rename to LEGO1/lego/legoomni/include/elevatorbottom.h diff --git a/LEGO1/extra.h b/LEGO1/lego/legoomni/include/extra.h similarity index 100% rename from LEGO1/extra.h rename to LEGO1/lego/legoomni/include/extra.h diff --git a/LEGO1/gasstation.h b/LEGO1/lego/legoomni/include/gasstation.h similarity index 100% rename from LEGO1/gasstation.h rename to LEGO1/lego/legoomni/include/gasstation.h diff --git a/LEGO1/gasstationentity.h b/LEGO1/lego/legoomni/include/gasstationentity.h similarity index 100% rename from LEGO1/gasstationentity.h rename to LEGO1/lego/legoomni/include/gasstationentity.h diff --git a/LEGO1/gasstationstate.h b/LEGO1/lego/legoomni/include/gasstationstate.h similarity index 100% rename from LEGO1/gasstationstate.h rename to LEGO1/lego/legoomni/include/gasstationstate.h diff --git a/LEGO1/gifmanager.h b/LEGO1/lego/legoomni/include/gifmanager.h similarity index 100% rename from LEGO1/gifmanager.h rename to LEGO1/lego/legoomni/include/gifmanager.h diff --git a/LEGO1/helicopter.h b/LEGO1/lego/legoomni/include/helicopter.h similarity index 100% rename from LEGO1/helicopter.h rename to LEGO1/lego/legoomni/include/helicopter.h diff --git a/LEGO1/helicopterstate.h b/LEGO1/lego/legoomni/include/helicopterstate.h similarity index 100% rename from LEGO1/helicopterstate.h rename to LEGO1/lego/legoomni/include/helicopterstate.h diff --git a/LEGO1/historybook.h b/LEGO1/lego/legoomni/include/historybook.h similarity index 100% rename from LEGO1/historybook.h rename to LEGO1/lego/legoomni/include/historybook.h diff --git a/LEGO1/hospital.h b/LEGO1/lego/legoomni/include/hospital.h similarity index 100% rename from LEGO1/hospital.h rename to LEGO1/lego/legoomni/include/hospital.h diff --git a/LEGO1/hospitalentity.h b/LEGO1/lego/legoomni/include/hospitalentity.h similarity index 100% rename from LEGO1/hospitalentity.h rename to LEGO1/lego/legoomni/include/hospitalentity.h diff --git a/LEGO1/hospitalstate.h b/LEGO1/lego/legoomni/include/hospitalstate.h similarity index 100% rename from LEGO1/hospitalstate.h rename to LEGO1/lego/legoomni/include/hospitalstate.h diff --git a/LEGO1/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h similarity index 100% rename from LEGO1/infocenter.h rename to LEGO1/lego/legoomni/include/infocenter.h diff --git a/LEGO1/infocenterdoor.h b/LEGO1/lego/legoomni/include/infocenterdoor.h similarity index 100% rename from LEGO1/infocenterdoor.h rename to LEGO1/lego/legoomni/include/infocenterdoor.h diff --git a/LEGO1/infocenterentity.h b/LEGO1/lego/legoomni/include/infocenterentity.h similarity index 100% rename from LEGO1/infocenterentity.h rename to LEGO1/lego/legoomni/include/infocenterentity.h diff --git a/LEGO1/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h similarity index 100% rename from LEGO1/infocenterstate.h rename to LEGO1/lego/legoomni/include/infocenterstate.h diff --git a/LEGO1/isle.h b/LEGO1/lego/legoomni/include/isle.h similarity index 100% rename from LEGO1/isle.h rename to LEGO1/lego/legoomni/include/isle.h diff --git a/LEGO1/isleactor.h b/LEGO1/lego/legoomni/include/isleactor.h similarity index 100% rename from LEGO1/isleactor.h rename to LEGO1/lego/legoomni/include/isleactor.h diff --git a/LEGO1/islepathactor.h b/LEGO1/lego/legoomni/include/islepathactor.h similarity index 100% rename from LEGO1/islepathactor.h rename to LEGO1/lego/legoomni/include/islepathactor.h diff --git a/LEGO1/jetski.h b/LEGO1/lego/legoomni/include/jetski.h similarity index 100% rename from LEGO1/jetski.h rename to LEGO1/lego/legoomni/include/jetski.h diff --git a/LEGO1/jetskirace.h b/LEGO1/lego/legoomni/include/jetskirace.h similarity index 100% rename from LEGO1/jetskirace.h rename to LEGO1/lego/legoomni/include/jetskirace.h diff --git a/LEGO1/jetskiracestate.h b/LEGO1/lego/legoomni/include/jetskiracestate.h similarity index 100% rename from LEGO1/jetskiracestate.h rename to LEGO1/lego/legoomni/include/jetskiracestate.h diff --git a/LEGO1/jukebox.h b/LEGO1/lego/legoomni/include/jukebox.h similarity index 100% rename from LEGO1/jukebox.h rename to LEGO1/lego/legoomni/include/jukebox.h diff --git a/LEGO1/jukeboxentity.h b/LEGO1/lego/legoomni/include/jukeboxentity.h similarity index 100% rename from LEGO1/jukeboxentity.h rename to LEGO1/lego/legoomni/include/jukeboxentity.h diff --git a/LEGO1/jukeboxstate.h b/LEGO1/lego/legoomni/include/jukeboxstate.h similarity index 100% rename from LEGO1/jukeboxstate.h rename to LEGO1/lego/legoomni/include/jukeboxstate.h diff --git a/LEGO1/lego3dwavepresenter.h b/LEGO1/lego/legoomni/include/lego3dwavepresenter.h similarity index 100% rename from LEGO1/lego3dwavepresenter.h rename to LEGO1/lego/legoomni/include/lego3dwavepresenter.h diff --git a/LEGO1/legoact2.h b/LEGO1/lego/legoomni/include/legoact2.h similarity index 100% rename from LEGO1/legoact2.h rename to LEGO1/lego/legoomni/include/legoact2.h diff --git a/LEGO1/legoact2state.h b/LEGO1/lego/legoomni/include/legoact2state.h similarity index 100% rename from LEGO1/legoact2state.h rename to LEGO1/lego/legoomni/include/legoact2state.h diff --git a/LEGO1/legoactioncontrolpresenter.h b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h similarity index 100% rename from LEGO1/legoactioncontrolpresenter.h rename to LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h diff --git a/LEGO1/legoactor.h b/LEGO1/lego/legoomni/include/legoactor.h similarity index 100% rename from LEGO1/legoactor.h rename to LEGO1/lego/legoomni/include/legoactor.h diff --git a/LEGO1/legoactorpresenter.h b/LEGO1/lego/legoomni/include/legoactorpresenter.h similarity index 100% rename from LEGO1/legoactorpresenter.h rename to LEGO1/lego/legoomni/include/legoactorpresenter.h diff --git a/LEGO1/legoanimactor.h b/LEGO1/lego/legoomni/include/legoanimactor.h similarity index 100% rename from LEGO1/legoanimactor.h rename to LEGO1/lego/legoomni/include/legoanimactor.h diff --git a/LEGO1/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h similarity index 100% rename from LEGO1/legoanimationmanager.h rename to LEGO1/lego/legoomni/include/legoanimationmanager.h diff --git a/LEGO1/legoanimmmpresenter.h b/LEGO1/lego/legoomni/include/legoanimmmpresenter.h similarity index 100% rename from LEGO1/legoanimmmpresenter.h rename to LEGO1/lego/legoomni/include/legoanimmmpresenter.h diff --git a/LEGO1/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h similarity index 100% rename from LEGO1/legoanimpresenter.h rename to LEGO1/lego/legoomni/include/legoanimpresenter.h diff --git a/LEGO1/legobackgroundcolor.h b/LEGO1/lego/legoomni/include/legobackgroundcolor.h similarity index 100% rename from LEGO1/legobackgroundcolor.h rename to LEGO1/lego/legoomni/include/legobackgroundcolor.h diff --git a/LEGO1/legobuildingmanager.h b/LEGO1/lego/legoomni/include/legobuildingmanager.h similarity index 100% rename from LEGO1/legobuildingmanager.h rename to LEGO1/lego/legoomni/include/legobuildingmanager.h diff --git a/LEGO1/legocachesound.h b/LEGO1/lego/legoomni/include/legocachesound.h similarity index 100% rename from LEGO1/legocachesound.h rename to LEGO1/lego/legoomni/include/legocachesound.h diff --git a/LEGO1/legocameracontroller.h b/LEGO1/lego/legoomni/include/legocameracontroller.h similarity index 100% rename from LEGO1/legocameracontroller.h rename to LEGO1/lego/legoomni/include/legocameracontroller.h diff --git a/LEGO1/legocarbuild.h b/LEGO1/lego/legoomni/include/legocarbuild.h similarity index 100% rename from LEGO1/legocarbuild.h rename to LEGO1/lego/legoomni/include/legocarbuild.h diff --git a/LEGO1/legocarbuildanimpresenter.h b/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h similarity index 100% rename from LEGO1/legocarbuildanimpresenter.h rename to LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h diff --git a/LEGO1/legocarraceactor.h b/LEGO1/lego/legoomni/include/legocarraceactor.h similarity index 100% rename from LEGO1/legocarraceactor.h rename to LEGO1/lego/legoomni/include/legocarraceactor.h diff --git a/LEGO1/legocontrolmanager.h b/LEGO1/lego/legoomni/include/legocontrolmanager.h similarity index 100% rename from LEGO1/legocontrolmanager.h rename to LEGO1/lego/legoomni/include/legocontrolmanager.h diff --git a/LEGO1/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h similarity index 99% rename from LEGO1/legoentity.h rename to LEGO1/lego/legoomni/include/legoentity.h index 5a2eb715..ba0e1a7b 100644 --- a/LEGO1/legoentity.h +++ b/LEGO1/lego/legoomni/include/legoentity.h @@ -3,10 +3,10 @@ #include "decomp.h" #include "extra.h" -#include "legoroi.h" #include "mxdsobject.h" #include "mxentity.h" #include "realtime/vector.h" +#include "roi/legoroi.h" // VTABLE: LEGO1 0x100d4858 // SIZE 0x68 (probably) diff --git a/LEGO1/legoentitypresenter.h b/LEGO1/lego/legoomni/include/legoentitypresenter.h similarity index 100% rename from LEGO1/legoentitypresenter.h rename to LEGO1/lego/legoomni/include/legoentitypresenter.h diff --git a/LEGO1/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h similarity index 100% rename from LEGO1/legoeventnotificationparam.h rename to LEGO1/lego/legoomni/include/legoeventnotificationparam.h diff --git a/LEGO1/legoextraactor.h b/LEGO1/lego/legoomni/include/legoextraactor.h similarity index 100% rename from LEGO1/legoextraactor.h rename to LEGO1/lego/legoomni/include/legoextraactor.h diff --git a/LEGO1/legoflctexturepresenter.h b/LEGO1/lego/legoomni/include/legoflctexturepresenter.h similarity index 100% rename from LEGO1/legoflctexturepresenter.h rename to LEGO1/lego/legoomni/include/legoflctexturepresenter.h diff --git a/LEGO1/legofullscreenmovie.h b/LEGO1/lego/legoomni/include/legofullscreenmovie.h similarity index 100% rename from LEGO1/legofullscreenmovie.h rename to LEGO1/lego/legoomni/include/legofullscreenmovie.h diff --git a/LEGO1/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h similarity index 100% rename from LEGO1/legogamestate.h rename to LEGO1/lego/legoomni/include/legogamestate.h diff --git a/LEGO1/legohideanimpresenter.h b/LEGO1/lego/legoomni/include/legohideanimpresenter.h similarity index 100% rename from LEGO1/legohideanimpresenter.h rename to LEGO1/lego/legoomni/include/legohideanimpresenter.h diff --git a/LEGO1/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h similarity index 100% rename from LEGO1/legoinputmanager.h rename to LEGO1/lego/legoomni/include/legoinputmanager.h diff --git a/LEGO1/legojetski.h b/LEGO1/lego/legoomni/include/legojetski.h similarity index 100% rename from LEGO1/legojetski.h rename to LEGO1/lego/legoomni/include/legojetski.h diff --git a/LEGO1/legojetskiraceactor.h b/LEGO1/lego/legoomni/include/legojetskiraceactor.h similarity index 100% rename from LEGO1/legojetskiraceactor.h rename to LEGO1/lego/legoomni/include/legojetskiraceactor.h diff --git a/LEGO1/legoloadcachesoundpresenter.h b/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h similarity index 100% rename from LEGO1/legoloadcachesoundpresenter.h rename to LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h diff --git a/LEGO1/legolocomotionanimpresenter.h b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h similarity index 100% rename from LEGO1/legolocomotionanimpresenter.h rename to LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h diff --git a/LEGO1/legoloopinganimpresenter.h b/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h similarity index 100% rename from LEGO1/legoloopinganimpresenter.h rename to LEGO1/lego/legoomni/include/legoloopinganimpresenter.h diff --git a/LEGO1/legometerpresenter.h b/LEGO1/lego/legoomni/include/legometerpresenter.h similarity index 100% rename from LEGO1/legometerpresenter.h rename to LEGO1/lego/legoomni/include/legometerpresenter.h diff --git a/LEGO1/legomodelpresenter.h b/LEGO1/lego/legoomni/include/legomodelpresenter.h similarity index 100% rename from LEGO1/legomodelpresenter.h rename to LEGO1/lego/legoomni/include/legomodelpresenter.h diff --git a/LEGO1/legonavcontroller.h b/LEGO1/lego/legoomni/include/legonavcontroller.h similarity index 100% rename from LEGO1/legonavcontroller.h rename to LEGO1/lego/legoomni/include/legonavcontroller.h diff --git a/LEGO1/legoobjectfactory.h b/LEGO1/lego/legoomni/include/legoobjectfactory.h similarity index 100% rename from LEGO1/legoobjectfactory.h rename to LEGO1/lego/legoomni/include/legoobjectfactory.h diff --git a/LEGO1/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h similarity index 100% rename from LEGO1/legoomni.h rename to LEGO1/lego/legoomni/include/legoomni.h diff --git a/LEGO1/legopalettepresenter.h b/LEGO1/lego/legoomni/include/legopalettepresenter.h similarity index 100% rename from LEGO1/legopalettepresenter.h rename to LEGO1/lego/legoomni/include/legopalettepresenter.h diff --git a/LEGO1/legopartpresenter.h b/LEGO1/lego/legoomni/include/legopartpresenter.h similarity index 100% rename from LEGO1/legopartpresenter.h rename to LEGO1/lego/legoomni/include/legopartpresenter.h diff --git a/LEGO1/legopathactor.h b/LEGO1/lego/legoomni/include/legopathactor.h similarity index 100% rename from LEGO1/legopathactor.h rename to LEGO1/lego/legoomni/include/legopathactor.h diff --git a/LEGO1/legopathboundary.h b/LEGO1/lego/legoomni/include/legopathboundary.h similarity index 100% rename from LEGO1/legopathboundary.h rename to LEGO1/lego/legoomni/include/legopathboundary.h diff --git a/LEGO1/legopathcontroller.h b/LEGO1/lego/legoomni/include/legopathcontroller.h similarity index 100% rename from LEGO1/legopathcontroller.h rename to LEGO1/lego/legoomni/include/legopathcontroller.h diff --git a/LEGO1/legopathcontrollerlist.h b/LEGO1/lego/legoomni/include/legopathcontrollerlist.h similarity index 100% rename from LEGO1/legopathcontrollerlist.h rename to LEGO1/lego/legoomni/include/legopathcontrollerlist.h diff --git a/LEGO1/legopathpresenter.h b/LEGO1/lego/legoomni/include/legopathpresenter.h similarity index 100% rename from LEGO1/legopathpresenter.h rename to LEGO1/lego/legoomni/include/legopathpresenter.h diff --git a/LEGO1/legophonemepresenter.h b/LEGO1/lego/legoomni/include/legophonemepresenter.h similarity index 100% rename from LEGO1/legophonemepresenter.h rename to LEGO1/lego/legoomni/include/legophonemepresenter.h diff --git a/LEGO1/legoplantmanager.h b/LEGO1/lego/legoomni/include/legoplantmanager.h similarity index 100% rename from LEGO1/legoplantmanager.h rename to LEGO1/lego/legoomni/include/legoplantmanager.h diff --git a/LEGO1/legorace.h b/LEGO1/lego/legoomni/include/legorace.h similarity index 100% rename from LEGO1/legorace.h rename to LEGO1/lego/legoomni/include/legorace.h diff --git a/LEGO1/legoraceactor.h b/LEGO1/lego/legoomni/include/legoraceactor.h similarity index 100% rename from LEGO1/legoraceactor.h rename to LEGO1/lego/legoomni/include/legoraceactor.h diff --git a/LEGO1/legoracecar.h b/LEGO1/lego/legoomni/include/legoracecar.h similarity index 100% rename from LEGO1/legoracecar.h rename to LEGO1/lego/legoomni/include/legoracecar.h diff --git a/LEGO1/legosoundmanager.h b/LEGO1/lego/legoomni/include/legosoundmanager.h similarity index 100% rename from LEGO1/legosoundmanager.h rename to LEGO1/lego/legoomni/include/legosoundmanager.h diff --git a/LEGO1/legostate.h b/LEGO1/lego/legoomni/include/legostate.h similarity index 100% rename from LEGO1/legostate.h rename to LEGO1/lego/legoomni/include/legostate.h diff --git a/LEGO1/legostream.h b/LEGO1/lego/legoomni/include/legostream.h similarity index 100% rename from LEGO1/legostream.h rename to LEGO1/lego/legoomni/include/legostream.h diff --git a/LEGO1/legotexturepresenter.h b/LEGO1/lego/legoomni/include/legotexturepresenter.h similarity index 100% rename from LEGO1/legotexturepresenter.h rename to LEGO1/lego/legoomni/include/legotexturepresenter.h diff --git a/LEGO1/mxunknown100d7c88.h b/LEGO1/lego/legoomni/include/legounknown100d7c88.h similarity index 59% rename from LEGO1/mxunknown100d7c88.h rename to LEGO1/lego/legoomni/include/legounknown100d7c88.h index eccc6ee4..a6004053 100644 --- a/LEGO1/mxunknown100d7c88.h +++ b/LEGO1/lego/legoomni/include/legounknown100d7c88.h @@ -1,12 +1,12 @@ -#ifndef MXUNKNOWN100D7C88_H -#define MXUNKNOWN100D7C88_H +#ifndef LEGOUNKNOWN100D7C88_H +#define LEGOUNKNOWN100D7C88_H #include "decomp.h" #include "mxstring.h" -class MxUnknown100d7c88 { +class LegoUnknown100d7c88 { public: - ~MxUnknown100d7c88(); + ~LegoUnknown100d7c88(); virtual undefined4 VTable0x00(); // vtable+0x00 // More virtual functions @@ -16,4 +16,4 @@ class MxUnknown100d7c88 { undefined4 m_unk0x14; // 0x14 }; -#endif // MXUNKNOWN100D7C88_H +#endif // LEGOUNKNOWN100D7C88_H diff --git a/LEGO1/lego/legoomni/include/legounknown100d9d00.h b/LEGO1/lego/legoomni/include/legounknown100d9d00.h new file mode 100644 index 00000000..d31634fe --- /dev/null +++ b/LEGO1/lego/legoomni/include/legounknown100d9d00.h @@ -0,0 +1,42 @@ +#ifndef LEGOUNKNOWN100D9D00_H +#define LEGOUNKNOWN100D9D00_H + +#include "decomp.h" +#include "legounknown100d7c88.h" +#include "mxlist.h" + +// VTABLE: LEGO1 0x100d9cd0 +// class MxCollection + +// VTABLE: LEGO1 0x100d9ce8 +// class MxList + +// VTABLE: LEGO1 0x100d9d00 +// SIZE 0x18 +class LegoUnknown100d9d00 : public MxList { +public: + LegoUnknown100d9d00() { SetDestroy(Destroy); } + + // STUB: LEGO1 0x1007b210 + virtual MxS8 Compare(LegoUnknown100d7c88* p_a, LegoUnknown100d7c88* p_b) override { return -1; } // vtable+0x14 + + // FUNCTION: LEGO1 0x1007b2e0 + static void Destroy(LegoUnknown100d7c88* p_element) { delete p_element; } +}; + +// TEMPLATE: LEGO1 0x1007b300 +// MxCollection::Compare + +// TEMPLATE: LEGO1 0x1007b360 +// MxCollection::Destroy + +// SYNTHETIC: LEGO1 0x1007b400 +// LegoUnknown100d9d00::`scalar deleting destructor' + +// SYNTHETIC: LEGO1 0x1007b470 +// MxCollection::`scalar deleting destructor' + +// SYNTHETIC: LEGO1 0x1007b4e0 +// MxList::`scalar deleting destructor' + +#endif // LEGOUNKNOWN100D9D00_H diff --git a/LEGO1/legounksavedatawriter.h b/LEGO1/lego/legoomni/include/legounksavedatawriter.h similarity index 100% rename from LEGO1/legounksavedatawriter.h rename to LEGO1/lego/legoomni/include/legounksavedatawriter.h diff --git a/LEGO1/legoutil.h b/LEGO1/lego/legoomni/include/legoutil.h similarity index 100% rename from LEGO1/legoutil.h rename to LEGO1/lego/legoomni/include/legoutil.h diff --git a/LEGO1/legovehiclebuildstate.h b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h similarity index 100% rename from LEGO1/legovehiclebuildstate.h rename to LEGO1/lego/legoomni/include/legovehiclebuildstate.h diff --git a/LEGO1/legovideomanager.h b/LEGO1/lego/legoomni/include/legovideomanager.h similarity index 52% rename from LEGO1/legovideomanager.h rename to LEGO1/lego/legoomni/include/legovideomanager.h index 884b31ad..0783931a 100644 --- a/LEGO1/legovideomanager.h +++ b/LEGO1/lego/legoomni/include/legovideomanager.h @@ -3,9 +3,9 @@ #include "3dmanager/lego3dmanager.h" #include "decomp.h" +#include "legounknown100d9d00.h" #include "mxdirectx/mxdirect3d.h" #include "mxdirectx/mxstopwatch.h" -#include "mxunknown100d9d00.h" #include "mxvideomanager.h" #include @@ -33,7 +33,7 @@ class LegoVideoManager : public MxVideoManager { virtual void VTable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height) override; // vtable+0x34 virtual void VTable0x38(undefined4, undefined4); // vtable+0x38 // FUNCTION: LGEO1 0x1007ab10 - virtual MxUnknown100d9d00* VTable0x3c() { return m_unk0x100d9d00; } // vtable+0x3c + virtual LegoUnknown100d9d00* VTable0x3c() { return m_unk0x100d9d00; } // vtable+0x3c void SetSkyColor(float p_red, float p_green, float p_blue); void OverrideSkyColor(MxBool p_shouldOverride); @@ -49,39 +49,39 @@ class LegoVideoManager : public MxVideoManager { inline void DrawCursor(); - Tgl::Renderer* m_renderer; // 0x64 - Lego3DManager* m_3dManager; // 0x68 - LegoROI* m_viewROI; // 0x6c - undefined4 m_unk0x70; // 0x70 - MxDirect3D* m_direct3d; // 0x74 - undefined4 m_unk0x78[27]; // 0x78 - MxBool m_unk0xe4; // 0xe4 - MxBool m_unk0xe5; // 0xe5 - MxBool m_unk0xe6; // 0xe6 - PALETTEENTRY m_paletteEntries[256]; // 0xe7 - undefined m_padding0x4e7; // 0x4e7 - MxUnknown100d9d00* m_unk0x100d9d00; // 0x4e8 - MxBool m_isFullscreenMovie; // 0x4ec - MxPalette* m_palette; // 0x4f0 - MxStopWatch* m_stopWatch; // 0x4f4 - double m_elapsedSeconds; // 0x4f8 - MxBool m_unk0x500; // 0x500 - MxBool m_drawCursor; // 0x501 - MxS32 m_cursorXCopy; // 0x504 - MxS32 m_cursorYCopy; // 0x508 - MxS32 m_cursorX; // 0x50c - MxS32 m_cursorY; // 0x510 - LPDIRECTDRAWSURFACE m_unk0x514; // 0x514 - RECT m_unk0x518; // 0x518 - undefined4 m_unk0x528; // 0x528 - MxBool m_drawFPS; // 0x52c - RECT m_fpsRect; // 0x530 - HFONT m_arialFont; // 0x540 - SIZE m_fpsSize; // 0x544 - undefined m_pad0x54c[8]; // 0x54c - MxBool m_unk0x554; // 0x554 - MxBool m_initialized; // 0x555 - undefined m_pad0x556[0x39]; // 0x556 + Tgl::Renderer* m_renderer; // 0x64 + Lego3DManager* m_3dManager; // 0x68 + LegoROI* m_viewROI; // 0x6c + undefined4 m_unk0x70; // 0x70 + MxDirect3D* m_direct3d; // 0x74 + undefined4 m_unk0x78[27]; // 0x78 + MxBool m_unk0xe4; // 0xe4 + MxBool m_unk0xe5; // 0xe5 + MxBool m_unk0xe6; // 0xe6 + PALETTEENTRY m_paletteEntries[256]; // 0xe7 + undefined m_padding0x4e7; // 0x4e7 + LegoUnknown100d9d00* m_unk0x100d9d00; // 0x4e8 + MxBool m_isFullscreenMovie; // 0x4ec + MxPalette* m_palette; // 0x4f0 + MxStopWatch* m_stopWatch; // 0x4f4 + double m_elapsedSeconds; // 0x4f8 + MxBool m_unk0x500; // 0x500 + MxBool m_drawCursor; // 0x501 + MxS32 m_cursorXCopy; // 0x504 + MxS32 m_cursorYCopy; // 0x508 + MxS32 m_cursorX; // 0x50c + MxS32 m_cursorY; // 0x510 + LPDIRECTDRAWSURFACE m_unk0x514; // 0x514 + RECT m_unk0x518; // 0x518 + undefined4 m_unk0x528; // 0x528 + MxBool m_drawFPS; // 0x52c + RECT m_fpsRect; // 0x530 + HFONT m_arialFont; // 0x540 + SIZE m_fpsSize; // 0x544 + undefined m_pad0x54c[8]; // 0x54c + MxBool m_unk0x554; // 0x554 + MxBool m_initialized; // 0x555 + undefined m_pad0x556[0x39]; // 0x556 }; // SYNTHETIC: LEGO1 0x1007ab20 diff --git a/LEGO1/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h similarity index 100% rename from LEGO1/legoworld.h rename to LEGO1/lego/legoomni/include/legoworld.h diff --git a/LEGO1/legoworldlist.h b/LEGO1/lego/legoomni/include/legoworldlist.h similarity index 100% rename from LEGO1/legoworldlist.h rename to LEGO1/lego/legoomni/include/legoworldlist.h diff --git a/LEGO1/legoworldpresenter.h b/LEGO1/lego/legoomni/include/legoworldpresenter.h similarity index 100% rename from LEGO1/legoworldpresenter.h rename to LEGO1/lego/legoomni/include/legoworldpresenter.h diff --git a/LEGO1/motorcycle.h b/LEGO1/lego/legoomni/include/motorcycle.h similarity index 100% rename from LEGO1/motorcycle.h rename to LEGO1/lego/legoomni/include/motorcycle.h diff --git a/LEGO1/pizza.h b/LEGO1/lego/legoomni/include/pizza.h similarity index 100% rename from LEGO1/pizza.h rename to LEGO1/lego/legoomni/include/pizza.h diff --git a/LEGO1/pizzamissionstate.h b/LEGO1/lego/legoomni/include/pizzamissionstate.h similarity index 100% rename from LEGO1/pizzamissionstate.h rename to LEGO1/lego/legoomni/include/pizzamissionstate.h diff --git a/LEGO1/pizzeria.h b/LEGO1/lego/legoomni/include/pizzeria.h similarity index 100% rename from LEGO1/pizzeria.h rename to LEGO1/lego/legoomni/include/pizzeria.h diff --git a/LEGO1/pizzeriastate.h b/LEGO1/lego/legoomni/include/pizzeriastate.h similarity index 100% rename from LEGO1/pizzeriastate.h rename to LEGO1/lego/legoomni/include/pizzeriastate.h diff --git a/LEGO1/police.h b/LEGO1/lego/legoomni/include/police.h similarity index 100% rename from LEGO1/police.h rename to LEGO1/lego/legoomni/include/police.h diff --git a/LEGO1/policeentity.h b/LEGO1/lego/legoomni/include/policeentity.h similarity index 100% rename from LEGO1/policeentity.h rename to LEGO1/lego/legoomni/include/policeentity.h diff --git a/LEGO1/policestate.h b/LEGO1/lego/legoomni/include/policestate.h similarity index 100% rename from LEGO1/policestate.h rename to LEGO1/lego/legoomni/include/policestate.h diff --git a/LEGO1/racecar.h b/LEGO1/lego/legoomni/include/racecar.h similarity index 100% rename from LEGO1/racecar.h rename to LEGO1/lego/legoomni/include/racecar.h diff --git a/LEGO1/racestandsentity.h b/LEGO1/lego/legoomni/include/racestandsentity.h similarity index 100% rename from LEGO1/racestandsentity.h rename to LEGO1/lego/legoomni/include/racestandsentity.h diff --git a/LEGO1/racestate.h b/LEGO1/lego/legoomni/include/racestate.h similarity index 100% rename from LEGO1/racestate.h rename to LEGO1/lego/legoomni/include/racestate.h diff --git a/LEGO1/radio.h b/LEGO1/lego/legoomni/include/radio.h similarity index 100% rename from LEGO1/radio.h rename to LEGO1/lego/legoomni/include/radio.h diff --git a/LEGO1/radiostate.h b/LEGO1/lego/legoomni/include/radiostate.h similarity index 100% rename from LEGO1/radiostate.h rename to LEGO1/lego/legoomni/include/radiostate.h diff --git a/LEGO1/registrationbook.h b/LEGO1/lego/legoomni/include/registrationbook.h similarity index 100% rename from LEGO1/registrationbook.h rename to LEGO1/lego/legoomni/include/registrationbook.h diff --git a/LEGO1/score.h b/LEGO1/lego/legoomni/include/score.h similarity index 100% rename from LEGO1/score.h rename to LEGO1/lego/legoomni/include/score.h diff --git a/LEGO1/scorestate.h b/LEGO1/lego/legoomni/include/scorestate.h similarity index 100% rename from LEGO1/scorestate.h rename to LEGO1/lego/legoomni/include/scorestate.h diff --git a/LEGO1/skateboard.h b/LEGO1/lego/legoomni/include/skateboard.h similarity index 100% rename from LEGO1/skateboard.h rename to LEGO1/lego/legoomni/include/skateboard.h diff --git a/LEGO1/towtrack.h b/LEGO1/lego/legoomni/include/towtrack.h similarity index 100% rename from LEGO1/towtrack.h rename to LEGO1/lego/legoomni/include/towtrack.h diff --git a/LEGO1/towtrackmissionstate.h b/LEGO1/lego/legoomni/include/towtrackmissionstate.h similarity index 100% rename from LEGO1/towtrackmissionstate.h rename to LEGO1/lego/legoomni/include/towtrackmissionstate.h diff --git a/LEGO1/act1state.cpp b/LEGO1/lego/legoomni/src/act1/act1state.cpp similarity index 100% rename from LEGO1/act1state.cpp rename to LEGO1/lego/legoomni/src/act1/act1state.cpp diff --git a/LEGO1/act2brick.cpp b/LEGO1/lego/legoomni/src/act2/act2brick.cpp similarity index 100% rename from LEGO1/act2brick.cpp rename to LEGO1/lego/legoomni/src/act2/act2brick.cpp diff --git a/LEGO1/act2policestation.cpp b/LEGO1/lego/legoomni/src/act2/act2policestation.cpp similarity index 100% rename from LEGO1/act2policestation.cpp rename to LEGO1/lego/legoomni/src/act2/act2policestation.cpp diff --git a/LEGO1/legoact2state.cpp b/LEGO1/lego/legoomni/src/act2/legoact2state.cpp similarity index 100% rename from LEGO1/legoact2state.cpp rename to LEGO1/lego/legoomni/src/act2/legoact2state.cpp diff --git a/LEGO1/act3.cpp b/LEGO1/lego/legoomni/src/act3/act3.cpp similarity index 100% rename from LEGO1/act3.cpp rename to LEGO1/lego/legoomni/src/act3/act3.cpp diff --git a/LEGO1/act3shark.cpp b/LEGO1/lego/legoomni/src/act3/act3shark.cpp similarity index 100% rename from LEGO1/act3shark.cpp rename to LEGO1/lego/legoomni/src/act3/act3shark.cpp diff --git a/LEGO1/act3state.cpp b/LEGO1/lego/legoomni/src/act3/act3state.cpp similarity index 100% rename from LEGO1/act3state.cpp rename to LEGO1/lego/legoomni/src/act3/act3state.cpp diff --git a/LEGO1/legocachesound.cpp b/LEGO1/lego/legoomni/src/audio/legocachesound.cpp similarity index 100% rename from LEGO1/legocachesound.cpp rename to LEGO1/lego/legoomni/src/audio/legocachesound.cpp diff --git a/LEGO1/legoloadcachesoundpresenter.cpp b/LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp similarity index 100% rename from LEGO1/legoloadcachesoundpresenter.cpp rename to LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp diff --git a/LEGO1/legosoundmanager.cpp b/LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp similarity index 100% rename from LEGO1/legosoundmanager.cpp rename to LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp diff --git a/LEGO1/buildingentity.cpp b/LEGO1/lego/legoomni/src/build/buildingentity.cpp similarity index 100% rename from LEGO1/buildingentity.cpp rename to LEGO1/lego/legoomni/src/build/buildingentity.cpp diff --git a/LEGO1/dunebuggy.cpp b/LEGO1/lego/legoomni/src/build/dunebuggy.cpp similarity index 100% rename from LEGO1/dunebuggy.cpp rename to LEGO1/lego/legoomni/src/build/dunebuggy.cpp diff --git a/LEGO1/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp similarity index 100% rename from LEGO1/helicopter.cpp rename to LEGO1/lego/legoomni/src/build/helicopter.cpp diff --git a/LEGO1/helicopterstate.cpp b/LEGO1/lego/legoomni/src/build/helicopterstate.cpp similarity index 100% rename from LEGO1/helicopterstate.cpp rename to LEGO1/lego/legoomni/src/build/helicopterstate.cpp diff --git a/LEGO1/jetski.cpp b/LEGO1/lego/legoomni/src/build/jetski.cpp similarity index 100% rename from LEGO1/jetski.cpp rename to LEGO1/lego/legoomni/src/build/jetski.cpp diff --git a/LEGO1/legobuildingmanager.cpp b/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp similarity index 100% rename from LEGO1/legobuildingmanager.cpp rename to LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp diff --git a/LEGO1/legocarbuild.cpp b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp similarity index 100% rename from LEGO1/legocarbuild.cpp rename to LEGO1/lego/legoomni/src/build/legocarbuild.cpp diff --git a/LEGO1/legovehiclebuildstate.cpp b/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp similarity index 100% rename from LEGO1/legovehiclebuildstate.cpp rename to LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp diff --git a/LEGO1/racecar.cpp b/LEGO1/lego/legoomni/src/build/racecar.cpp similarity index 100% rename from LEGO1/racecar.cpp rename to LEGO1/lego/legoomni/src/build/racecar.cpp diff --git a/LEGO1/animstate.cpp b/LEGO1/lego/legoomni/src/common/animstate.cpp similarity index 100% rename from LEGO1/animstate.cpp rename to LEGO1/lego/legoomni/src/common/animstate.cpp diff --git a/LEGO1/gifmanager.cpp b/LEGO1/lego/legoomni/src/common/gifmanager.cpp similarity index 100% rename from LEGO1/gifmanager.cpp rename to LEGO1/lego/legoomni/src/common/gifmanager.cpp diff --git a/LEGO1/legoactioncontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp similarity index 100% rename from LEGO1/legoactioncontrolpresenter.cpp rename to LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp diff --git a/LEGO1/legobackgroundcolor.cpp b/LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp similarity index 100% rename from LEGO1/legobackgroundcolor.cpp rename to LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp diff --git a/LEGO1/legocameracontroller.cpp b/LEGO1/lego/legoomni/src/common/legocameracontroller.cpp similarity index 100% rename from LEGO1/legocameracontroller.cpp rename to LEGO1/lego/legoomni/src/common/legocameracontroller.cpp diff --git a/LEGO1/legofullscreenmovie.cpp b/LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp similarity index 100% rename from LEGO1/legofullscreenmovie.cpp rename to LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp diff --git a/LEGO1/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp similarity index 99% rename from LEGO1/legogamestate.cpp rename to LEGO1/lego/legoomni/src/common/legogamestate.cpp index 23e04601..a081248c 100644 --- a/LEGO1/legogamestate.cpp +++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp @@ -2,12 +2,12 @@ #include "infocenterstate.h" #include "legoomni.h" -#include "legoroi.h" #include "legostate.h" #include "legostream.h" #include "mxobjectfactory.h" #include "mxstring.h" #include "mxvariabletable.h" +#include "roi/legoroi.h" #include diff --git a/LEGO1/legonavcontroller.cpp b/LEGO1/lego/legoomni/src/common/legonavcontroller.cpp similarity index 100% rename from LEGO1/legonavcontroller.cpp rename to LEGO1/lego/legoomni/src/common/legonavcontroller.cpp diff --git a/LEGO1/legoobjectfactory.cpp b/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp similarity index 100% rename from LEGO1/legoobjectfactory.cpp rename to LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp diff --git a/LEGO1/legoplantmanager.cpp b/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp similarity index 100% rename from LEGO1/legoplantmanager.cpp rename to LEGO1/lego/legoomni/src/common/legoplantmanager.cpp diff --git a/LEGO1/legostate.cpp b/LEGO1/lego/legoomni/src/common/legostate.cpp similarity index 100% rename from LEGO1/legostate.cpp rename to LEGO1/lego/legoomni/src/common/legostate.cpp diff --git a/LEGO1/legostream.cpp b/LEGO1/lego/legoomni/src/common/legostream.cpp similarity index 100% rename from LEGO1/legostream.cpp rename to LEGO1/lego/legoomni/src/common/legostream.cpp diff --git a/LEGO1/legounksavedatawriter.cpp b/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp similarity index 100% rename from LEGO1/legounksavedatawriter.cpp rename to LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp diff --git a/LEGO1/legoutil.cpp b/LEGO1/lego/legoomni/src/common/legoutil.cpp similarity index 100% rename from LEGO1/legoutil.cpp rename to LEGO1/lego/legoomni/src/common/legoutil.cpp diff --git a/LEGO1/legocontrolmanager.cpp b/LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp similarity index 100% rename from LEGO1/legocontrolmanager.cpp rename to LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp diff --git a/LEGO1/legoactor.cpp b/LEGO1/lego/legoomni/src/entity/legoactor.cpp similarity index 100% rename from LEGO1/legoactor.cpp rename to LEGO1/lego/legoomni/src/entity/legoactor.cpp diff --git a/LEGO1/legoanimactor.cpp b/LEGO1/lego/legoomni/src/entity/legoanimactor.cpp similarity index 100% rename from LEGO1/legoanimactor.cpp rename to LEGO1/lego/legoomni/src/entity/legoanimactor.cpp diff --git a/LEGO1/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp similarity index 100% rename from LEGO1/legoentity.cpp rename to LEGO1/lego/legoomni/src/entity/legoentity.cpp diff --git a/LEGO1/legoentitypresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp similarity index 100% rename from LEGO1/legoentitypresenter.cpp rename to LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp diff --git a/LEGO1/legojetski.cpp b/LEGO1/lego/legoomni/src/entity/legojetski.cpp similarity index 100% rename from LEGO1/legojetski.cpp rename to LEGO1/lego/legoomni/src/entity/legojetski.cpp diff --git a/LEGO1/legopathactor.cpp b/LEGO1/lego/legoomni/src/entity/legopathactor.cpp similarity index 100% rename from LEGO1/legopathactor.cpp rename to LEGO1/lego/legoomni/src/entity/legopathactor.cpp diff --git a/LEGO1/legorace.cpp b/LEGO1/lego/legoomni/src/entity/legorace.cpp similarity index 100% rename from LEGO1/legorace.cpp rename to LEGO1/lego/legoomni/src/entity/legorace.cpp diff --git a/LEGO1/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp similarity index 100% rename from LEGO1/legoworld.cpp rename to LEGO1/lego/legoomni/src/entity/legoworld.cpp diff --git a/LEGO1/legoworldpresenter.cpp b/LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp similarity index 100% rename from LEGO1/legoworldpresenter.cpp rename to LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp diff --git a/LEGO1/gasstation.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstation.cpp similarity index 100% rename from LEGO1/gasstation.cpp rename to LEGO1/lego/legoomni/src/gasstation/gasstation.cpp diff --git a/LEGO1/gasstationentity.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstationentity.cpp similarity index 100% rename from LEGO1/gasstationentity.cpp rename to LEGO1/lego/legoomni/src/gasstation/gasstationentity.cpp diff --git a/LEGO1/gasstationstate.cpp b/LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp similarity index 100% rename from LEGO1/gasstationstate.cpp rename to LEGO1/lego/legoomni/src/gasstation/gasstationstate.cpp diff --git a/LEGO1/ambulance.cpp b/LEGO1/lego/legoomni/src/hospital/ambulance.cpp similarity index 100% rename from LEGO1/ambulance.cpp rename to LEGO1/lego/legoomni/src/hospital/ambulance.cpp diff --git a/LEGO1/ambulancemissionstate.cpp b/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp similarity index 100% rename from LEGO1/ambulancemissionstate.cpp rename to LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp diff --git a/LEGO1/hospital.cpp b/LEGO1/lego/legoomni/src/hospital/hospital.cpp similarity index 100% rename from LEGO1/hospital.cpp rename to LEGO1/lego/legoomni/src/hospital/hospital.cpp diff --git a/LEGO1/hospitalentity.cpp b/LEGO1/lego/legoomni/src/hospital/hospitalentity.cpp similarity index 100% rename from LEGO1/hospitalentity.cpp rename to LEGO1/lego/legoomni/src/hospital/hospitalentity.cpp diff --git a/LEGO1/hospitalstate.cpp b/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp similarity index 100% rename from LEGO1/hospitalstate.cpp rename to LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp diff --git a/LEGO1/elevatorbottom.cpp b/LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp similarity index 100% rename from LEGO1/elevatorbottom.cpp rename to LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp diff --git a/LEGO1/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp similarity index 100% rename from LEGO1/infocenter.cpp rename to LEGO1/lego/legoomni/src/infocenter/infocenter.cpp diff --git a/LEGO1/infocenterdoor.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp similarity index 100% rename from LEGO1/infocenterdoor.cpp rename to LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp diff --git a/LEGO1/infocenterentity.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterentity.cpp similarity index 100% rename from LEGO1/infocenterentity.cpp rename to LEGO1/lego/legoomni/src/infocenter/infocenterentity.cpp diff --git a/LEGO1/infocenterstate.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp similarity index 100% rename from LEGO1/infocenterstate.cpp rename to LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp diff --git a/LEGO1/registrationbook.cpp b/LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp similarity index 100% rename from LEGO1/registrationbook.cpp rename to LEGO1/lego/legoomni/src/infocenter/registrationbook.cpp diff --git a/LEGO1/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp similarity index 100% rename from LEGO1/score.cpp rename to LEGO1/lego/legoomni/src/infocenter/score.cpp diff --git a/LEGO1/scorestate.cpp b/LEGO1/lego/legoomni/src/infocenter/scorestate.cpp similarity index 100% rename from LEGO1/scorestate.cpp rename to LEGO1/lego/legoomni/src/infocenter/scorestate.cpp diff --git a/LEGO1/legoinputmanager.cpp b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp similarity index 100% rename from LEGO1/legoinputmanager.cpp rename to LEGO1/lego/legoomni/src/input/legoinputmanager.cpp diff --git a/LEGO1/beachhouseentity.cpp b/LEGO1/lego/legoomni/src/isle/beachhouseentity.cpp similarity index 100% rename from LEGO1/beachhouseentity.cpp rename to LEGO1/lego/legoomni/src/isle/beachhouseentity.cpp diff --git a/LEGO1/bike.cpp b/LEGO1/lego/legoomni/src/isle/bike.cpp similarity index 100% rename from LEGO1/bike.cpp rename to LEGO1/lego/legoomni/src/isle/bike.cpp diff --git a/LEGO1/bumpbouy.cpp b/LEGO1/lego/legoomni/src/isle/bumpbouy.cpp similarity index 100% rename from LEGO1/bumpbouy.cpp rename to LEGO1/lego/legoomni/src/isle/bumpbouy.cpp diff --git a/LEGO1/historybook.cpp b/LEGO1/lego/legoomni/src/isle/historybook.cpp similarity index 100% rename from LEGO1/historybook.cpp rename to LEGO1/lego/legoomni/src/isle/historybook.cpp diff --git a/LEGO1/isle.cpp b/LEGO1/lego/legoomni/src/isle/isle.cpp similarity index 100% rename from LEGO1/isle.cpp rename to LEGO1/lego/legoomni/src/isle/isle.cpp diff --git a/LEGO1/isleactor.cpp b/LEGO1/lego/legoomni/src/isle/isleactor.cpp similarity index 100% rename from LEGO1/isleactor.cpp rename to LEGO1/lego/legoomni/src/isle/isleactor.cpp diff --git a/LEGO1/islepathactor.cpp b/LEGO1/lego/legoomni/src/isle/islepathactor.cpp similarity index 100% rename from LEGO1/islepathactor.cpp rename to LEGO1/lego/legoomni/src/isle/islepathactor.cpp diff --git a/LEGO1/jukebox.cpp b/LEGO1/lego/legoomni/src/isle/jukebox.cpp similarity index 100% rename from LEGO1/jukebox.cpp rename to LEGO1/lego/legoomni/src/isle/jukebox.cpp diff --git a/LEGO1/jukeboxentity.cpp b/LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp similarity index 100% rename from LEGO1/jukeboxentity.cpp rename to LEGO1/lego/legoomni/src/isle/jukeboxentity.cpp diff --git a/LEGO1/jukeboxstate.cpp b/LEGO1/lego/legoomni/src/isle/jukeboxstate.cpp similarity index 100% rename from LEGO1/jukeboxstate.cpp rename to LEGO1/lego/legoomni/src/isle/jukeboxstate.cpp diff --git a/LEGO1/motorcycle.cpp b/LEGO1/lego/legoomni/src/isle/motorcycle.cpp similarity index 100% rename from LEGO1/motorcycle.cpp rename to LEGO1/lego/legoomni/src/isle/motorcycle.cpp diff --git a/LEGO1/radio.cpp b/LEGO1/lego/legoomni/src/isle/radio.cpp similarity index 100% rename from LEGO1/radio.cpp rename to LEGO1/lego/legoomni/src/isle/radio.cpp diff --git a/LEGO1/radiostate.cpp b/LEGO1/lego/legoomni/src/isle/radiostate.cpp similarity index 100% rename from LEGO1/radiostate.cpp rename to LEGO1/lego/legoomni/src/isle/radiostate.cpp diff --git a/LEGO1/skateboard.cpp b/LEGO1/lego/legoomni/src/isle/skateboard.cpp similarity index 100% rename from LEGO1/skateboard.cpp rename to LEGO1/lego/legoomni/src/isle/skateboard.cpp diff --git a/LEGO1/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp similarity index 100% rename from LEGO1/legoomni.cpp rename to LEGO1/lego/legoomni/src/main/legoomni.cpp diff --git a/LEGO1/legoeventnotificationparam.cpp b/LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp similarity index 100% rename from LEGO1/legoeventnotificationparam.cpp rename to LEGO1/lego/legoomni/src/notify/legoeventnotificationparam.cpp diff --git a/LEGO1/legopathcontroller.cpp b/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp similarity index 100% rename from LEGO1/legopathcontroller.cpp rename to LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp diff --git a/LEGO1/legopathpresenter.cpp b/LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp similarity index 100% rename from LEGO1/legopathpresenter.cpp rename to LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp diff --git a/LEGO1/pizza.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizza.cpp similarity index 100% rename from LEGO1/pizza.cpp rename to LEGO1/lego/legoomni/src/pizzeria/pizza.cpp diff --git a/LEGO1/pizzamissionstate.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp similarity index 100% rename from LEGO1/pizzamissionstate.cpp rename to LEGO1/lego/legoomni/src/pizzeria/pizzamissionstate.cpp diff --git a/LEGO1/pizzeria.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizzeria.cpp similarity index 100% rename from LEGO1/pizzeria.cpp rename to LEGO1/lego/legoomni/src/pizzeria/pizzeria.cpp diff --git a/LEGO1/pizzeriastate.cpp b/LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp similarity index 100% rename from LEGO1/pizzeriastate.cpp rename to LEGO1/lego/legoomni/src/pizzeria/pizzeriastate.cpp diff --git a/LEGO1/police.cpp b/LEGO1/lego/legoomni/src/police/police.cpp similarity index 100% rename from LEGO1/police.cpp rename to LEGO1/lego/legoomni/src/police/police.cpp diff --git a/LEGO1/policeentity.cpp b/LEGO1/lego/legoomni/src/police/policeentity.cpp similarity index 100% rename from LEGO1/policeentity.cpp rename to LEGO1/lego/legoomni/src/police/policeentity.cpp diff --git a/LEGO1/policestate.cpp b/LEGO1/lego/legoomni/src/police/policestate.cpp similarity index 100% rename from LEGO1/policestate.cpp rename to LEGO1/lego/legoomni/src/police/policestate.cpp diff --git a/LEGO1/carrace.cpp b/LEGO1/lego/legoomni/src/race/carrace.cpp similarity index 100% rename from LEGO1/carrace.cpp rename to LEGO1/lego/legoomni/src/race/carrace.cpp diff --git a/LEGO1/jetskirace.cpp b/LEGO1/lego/legoomni/src/race/jetskirace.cpp similarity index 100% rename from LEGO1/jetskirace.cpp rename to LEGO1/lego/legoomni/src/race/jetskirace.cpp diff --git a/LEGO1/racestandsentity.cpp b/LEGO1/lego/legoomni/src/race/racestandsentity.cpp similarity index 100% rename from LEGO1/racestandsentity.cpp rename to LEGO1/lego/legoomni/src/race/racestandsentity.cpp diff --git a/LEGO1/racestate.cpp b/LEGO1/lego/legoomni/src/race/racestate.cpp similarity index 100% rename from LEGO1/racestate.cpp rename to LEGO1/lego/legoomni/src/race/racestate.cpp diff --git a/LEGO1/towtrack.cpp b/LEGO1/lego/legoomni/src/towtrack/towtrack.cpp similarity index 100% rename from LEGO1/towtrack.cpp rename to LEGO1/lego/legoomni/src/towtrack/towtrack.cpp diff --git a/LEGO1/towtrackmissionstate.cpp b/LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp similarity index 100% rename from LEGO1/towtrackmissionstate.cpp rename to LEGO1/lego/legoomni/src/towtrack/towtrackmissionstate.cpp diff --git a/LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp b/LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp new file mode 100644 index 00000000..b3f386e3 --- /dev/null +++ b/LEGO1/lego/legoomni/src/unknown/legounknown100d7c88.cpp @@ -0,0 +1,12 @@ +#include "legounknown100d7c88.h" + +// FUNCTION: LEGO1 0x10044e50 +LegoUnknown100d7c88::~LegoUnknown100d7c88() +{ +} + +// FUNCTION: LEGO1 0x10044eb0 +MxU32 LegoUnknown100d7c88::VTable0x00() +{ + return m_unk0x14; +} diff --git a/LEGO1/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp similarity index 100% rename from LEGO1/legoanimationmanager.cpp rename to LEGO1/lego/legoomni/src/video/legoanimationmanager.cpp diff --git a/LEGO1/legoanimmmpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimmmpresenter.cpp similarity index 100% rename from LEGO1/legoanimmmpresenter.cpp rename to LEGO1/lego/legoomni/src/video/legoanimmmpresenter.cpp diff --git a/LEGO1/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp similarity index 100% rename from LEGO1/legoanimpresenter.cpp rename to LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp diff --git a/LEGO1/legocarbuildanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legocarbuildanimpresenter.cpp similarity index 100% rename from LEGO1/legocarbuildanimpresenter.cpp rename to LEGO1/lego/legoomni/src/video/legocarbuildanimpresenter.cpp diff --git a/LEGO1/legoflctexturepresenter.cpp b/LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp similarity index 100% rename from LEGO1/legoflctexturepresenter.cpp rename to LEGO1/lego/legoomni/src/video/legoflctexturepresenter.cpp diff --git a/LEGO1/legohideanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp similarity index 100% rename from LEGO1/legohideanimpresenter.cpp rename to LEGO1/lego/legoomni/src/video/legohideanimpresenter.cpp diff --git a/LEGO1/legolocomotionanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp similarity index 100% rename from LEGO1/legolocomotionanimpresenter.cpp rename to LEGO1/lego/legoomni/src/video/legolocomotionanimpresenter.cpp diff --git a/LEGO1/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp similarity index 100% rename from LEGO1/legometerpresenter.cpp rename to LEGO1/lego/legoomni/src/video/legometerpresenter.cpp diff --git a/LEGO1/legomodelpresenter.cpp b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp similarity index 100% rename from LEGO1/legomodelpresenter.cpp rename to LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp diff --git a/LEGO1/legopalettepresenter.cpp b/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp similarity index 100% rename from LEGO1/legopalettepresenter.cpp rename to LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp diff --git a/LEGO1/legopartpresenter.cpp b/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp similarity index 100% rename from LEGO1/legopartpresenter.cpp rename to LEGO1/lego/legoomni/src/video/legopartpresenter.cpp diff --git a/LEGO1/legophonemepresenter.cpp b/LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp similarity index 100% rename from LEGO1/legophonemepresenter.cpp rename to LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp diff --git a/LEGO1/legotexturepresenter.cpp b/LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp similarity index 100% rename from LEGO1/legotexturepresenter.cpp rename to LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp diff --git a/LEGO1/legovideomanager.cpp b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp similarity index 99% rename from LEGO1/legovideomanager.cpp rename to LEGO1/lego/legoomni/src/video/legovideomanager.cpp index 78f3788e..43cdde24 100644 --- a/LEGO1/legovideomanager.cpp +++ b/LEGO1/lego/legoomni/src/video/legovideomanager.cpp @@ -1,10 +1,10 @@ #include "legovideomanager.h" #include "legoomni.h" -#include "legoroi.h" #include "mxtimer.h" #include "mxtransitionmanager.h" #include "realtime/matrix.h" +#include "roi/legoroi.h" #include "tgl/d3drm/impl.h" #include "viewmanager/viewroi.h" @@ -178,7 +178,7 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM m_3dManager->Add(*m_viewROI); m_3dManager->SetPointOfView(*m_viewROI); - m_unk0x100d9d00 = new MxUnknown100d9d00; + m_unk0x100d9d00 = new LegoUnknown100d9d00; m_unk0xe4 = FALSE; m_stopWatch = new MxStopWatch; m_stopWatch->Start(); diff --git a/LEGO1/3dmanager/lego3dmanager.cpp b/LEGO1/lego/sources/3dmanager/lego3dmanager.cpp similarity index 98% rename from LEGO1/3dmanager/lego3dmanager.cpp rename to LEGO1/lego/sources/3dmanager/lego3dmanager.cpp index 99c977d5..4fa43a3c 100644 --- a/LEGO1/3dmanager/lego3dmanager.cpp +++ b/LEGO1/lego/sources/3dmanager/lego3dmanager.cpp @@ -2,8 +2,8 @@ // #include "lego3dmanager.h" -#include "../viewmanager/viewlodlist.h" #include "decomp.h" +#include "viewmanager/viewlodlist.h" DECOMP_SIZE_ASSERT(Lego3DManager, 0x10); diff --git a/LEGO1/3dmanager/lego3dmanager.h b/LEGO1/lego/sources/3dmanager/lego3dmanager.h similarity index 100% rename from LEGO1/3dmanager/lego3dmanager.h rename to LEGO1/lego/sources/3dmanager/lego3dmanager.h diff --git a/LEGO1/3dmanager/lego3dview.cpp b/LEGO1/lego/sources/3dmanager/lego3dview.cpp similarity index 99% rename from LEGO1/3dmanager/lego3dview.cpp rename to LEGO1/lego/sources/3dmanager/lego3dview.cpp index cdededa5..04c9ea22 100644 --- a/LEGO1/3dmanager/lego3dview.cpp +++ b/LEGO1/lego/sources/3dmanager/lego3dview.cpp @@ -3,7 +3,7 @@ #include "lego3dview.h" -#include "../viewmanager/viewmanager.h" +#include "viewmanager/viewmanager.h" DECOMP_SIZE_ASSERT(Lego3DView, 0xa8) diff --git a/LEGO1/3dmanager/lego3dview.h b/LEGO1/lego/sources/3dmanager/lego3dview.h similarity index 100% rename from LEGO1/3dmanager/lego3dview.h rename to LEGO1/lego/sources/3dmanager/lego3dview.h diff --git a/LEGO1/3dmanager/legoview1.cpp b/LEGO1/lego/sources/3dmanager/legoview1.cpp similarity index 99% rename from LEGO1/3dmanager/legoview1.cpp rename to LEGO1/lego/sources/3dmanager/legoview1.cpp index 57117e9c..3705eb33 100644 --- a/LEGO1/3dmanager/legoview1.cpp +++ b/LEGO1/lego/sources/3dmanager/legoview1.cpp @@ -3,8 +3,8 @@ #include "legoview1.h" -#include "../realtime/realtime.h" #include "decomp.h" +#include "realtime/realtime.h" #include // SETMAT4 diff --git a/LEGO1/3dmanager/legoview1.h b/LEGO1/lego/sources/3dmanager/legoview1.h similarity index 100% rename from LEGO1/3dmanager/legoview1.h rename to LEGO1/lego/sources/3dmanager/legoview1.h diff --git a/LEGO1/3dmanager/tglsurface.cpp b/LEGO1/lego/sources/3dmanager/tglsurface.cpp similarity index 100% rename from LEGO1/3dmanager/tglsurface.cpp rename to LEGO1/lego/sources/3dmanager/tglsurface.cpp diff --git a/LEGO1/3dmanager/tglsurface.h b/LEGO1/lego/sources/3dmanager/tglsurface.h similarity index 97% rename from LEGO1/3dmanager/tglsurface.h rename to LEGO1/lego/sources/3dmanager/tglsurface.h index 1e4abc09..2ea4cf12 100644 --- a/LEGO1/3dmanager/tglsurface.h +++ b/LEGO1/lego/sources/3dmanager/tglsurface.h @@ -1,8 +1,8 @@ #ifndef _TglSurface_h #define _TglSurface_h -#include "../mxdirectx/mxstopwatch.h" -#include "../tgl/tgl.h" +#include "mxdirectx/mxstopwatch.h" +#include "tgl/tgl.h" class Tgl::Renderer; class Tgl::Device; diff --git a/LEGO1/legoroi.cpp b/LEGO1/lego/sources/roi/legoroi.cpp similarity index 100% rename from LEGO1/legoroi.cpp rename to LEGO1/lego/sources/roi/legoroi.cpp diff --git a/LEGO1/legoroi.h b/LEGO1/lego/sources/roi/legoroi.h similarity index 100% rename from LEGO1/legoroi.h rename to LEGO1/lego/sources/roi/legoroi.h diff --git a/LEGO1/mxdirectx/mxdirect3d.h b/LEGO1/mxdirectx/mxdirect3d.h index 34c28b42..f0c87c69 100644 --- a/LEGO1/mxdirectx/mxdirect3d.h +++ b/LEGO1/mxdirectx/mxdirect3d.h @@ -1,9 +1,9 @@ #ifndef MXDIRECT3D_H #define MXDIRECT3D_H -#include "../mxstl/stlcompat.h" #include "decomp.h" #include "mxdirectdraw.h" +#include "mxstl/stlcompat.h" #include diff --git a/LEGO1/mxparam.cpp b/LEGO1/mxparam.cpp deleted file mode 100644 index 4faa1625..00000000 --- a/LEGO1/mxparam.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "mxparam.h" diff --git a/LEGO1/mxunknown100d7c88.cpp b/LEGO1/mxunknown100d7c88.cpp deleted file mode 100644 index 04ddbf4f..00000000 --- a/LEGO1/mxunknown100d7c88.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "mxunknown100d7c88.h" - -// FUNCTION: LEGO1 0x10044e50 -MxUnknown100d7c88::~MxUnknown100d7c88() -{ -} - -// FUNCTION: LEGO1 0x10044eb0 -MxU32 MxUnknown100d7c88::VTable0x00() -{ - return m_unk0x14; -} diff --git a/LEGO1/mxunknown100d9d00.h b/LEGO1/mxunknown100d9d00.h deleted file mode 100644 index d5dd456f..00000000 --- a/LEGO1/mxunknown100d9d00.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef MXUNKNOWN100D9D00_H -#define MXUNKNOWN100D9D00_H - -#include "decomp.h" -#include "mxlist.h" -#include "mxunknown100d7c88.h" - -// VTABLE: LEGO1 0x100d9cd0 -// class MxCollection - -// VTABLE: LEGO1 0x100d9ce8 -// class MxList - -// VTABLE: LEGO1 0x100d9d00 -// SIZE 0x18 -class MxUnknown100d9d00 : public MxList { -public: - MxUnknown100d9d00() { SetDestroy(Destroy); } - - // STUB: LEGO1 0x1007b210 - virtual MxS8 Compare(MxUnknown100d7c88* p_a, MxUnknown100d7c88* p_b) override { return -1; } // vtable+0x14 - - // FUNCTION: LEGO1 0x1007b2e0 - static void Destroy(MxUnknown100d7c88* p_element) { delete p_element; } -}; - -// TEMPLATE: LEGO1 0x1007b300 -// MxCollection::Compare - -// TEMPLATE: LEGO1 0x1007b360 -// MxCollection::Destroy - -// SYNTHETIC: LEGO1 0x1007b400 -// MxUnknown100d9d00::`scalar deleting destructor' - -// SYNTHETIC: LEGO1 0x1007b470 -// MxCollection::`scalar deleting destructor' - -// SYNTHETIC: LEGO1 0x1007b4e0 -// MxList::`scalar deleting destructor' - -#endif // MXUNKNOWN100D9D00_H diff --git a/LEGO1/mxactionnotificationparam.h b/LEGO1/omni/include/mxactionnotificationparam.h similarity index 100% rename from LEGO1/mxactionnotificationparam.h rename to LEGO1/omni/include/mxactionnotificationparam.h diff --git a/LEGO1/mxatomid.h b/LEGO1/omni/include/mxatomid.h similarity index 100% rename from LEGO1/mxatomid.h rename to LEGO1/omni/include/mxatomid.h diff --git a/LEGO1/mxatomidcounter.h b/LEGO1/omni/include/mxatomidcounter.h similarity index 100% rename from LEGO1/mxatomidcounter.h rename to LEGO1/omni/include/mxatomidcounter.h diff --git a/LEGO1/mxaudiomanager.h b/LEGO1/omni/include/mxaudiomanager.h similarity index 100% rename from LEGO1/mxaudiomanager.h rename to LEGO1/omni/include/mxaudiomanager.h diff --git a/LEGO1/mxaudiopresenter.h b/LEGO1/omni/include/mxaudiopresenter.h similarity index 100% rename from LEGO1/mxaudiopresenter.h rename to LEGO1/omni/include/mxaudiopresenter.h diff --git a/LEGO1/mxautolocker.h b/LEGO1/omni/include/mxautolocker.h similarity index 100% rename from LEGO1/mxautolocker.h rename to LEGO1/omni/include/mxautolocker.h diff --git a/LEGO1/mxbackgroundaudiomanager.h b/LEGO1/omni/include/mxbackgroundaudiomanager.h similarity index 100% rename from LEGO1/mxbackgroundaudiomanager.h rename to LEGO1/omni/include/mxbackgroundaudiomanager.h diff --git a/LEGO1/mxbitmap.h b/LEGO1/omni/include/mxbitmap.h similarity index 100% rename from LEGO1/mxbitmap.h rename to LEGO1/omni/include/mxbitmap.h diff --git a/LEGO1/mxcollection.h b/LEGO1/omni/include/mxcollection.h similarity index 100% rename from LEGO1/mxcollection.h rename to LEGO1/omni/include/mxcollection.h diff --git a/LEGO1/mxcompositemediapresenter.h b/LEGO1/omni/include/mxcompositemediapresenter.h similarity index 100% rename from LEGO1/mxcompositemediapresenter.h rename to LEGO1/omni/include/mxcompositemediapresenter.h diff --git a/LEGO1/mxcompositepresenter.h b/LEGO1/omni/include/mxcompositepresenter.h similarity index 100% rename from LEGO1/mxcompositepresenter.h rename to LEGO1/omni/include/mxcompositepresenter.h diff --git a/LEGO1/mxcontrolpresenter.h b/LEGO1/omni/include/mxcontrolpresenter.h similarity index 100% rename from LEGO1/mxcontrolpresenter.h rename to LEGO1/omni/include/mxcontrolpresenter.h diff --git a/LEGO1/mxcore.h b/LEGO1/omni/include/mxcore.h similarity index 100% rename from LEGO1/mxcore.h rename to LEGO1/omni/include/mxcore.h diff --git a/LEGO1/mxcriticalsection.h b/LEGO1/omni/include/mxcriticalsection.h similarity index 100% rename from LEGO1/mxcriticalsection.h rename to LEGO1/omni/include/mxcriticalsection.h diff --git a/LEGO1/mxdiskstreamcontroller.h b/LEGO1/omni/include/mxdiskstreamcontroller.h similarity index 100% rename from LEGO1/mxdiskstreamcontroller.h rename to LEGO1/omni/include/mxdiskstreamcontroller.h diff --git a/LEGO1/mxdiskstreamprovider.h b/LEGO1/omni/include/mxdiskstreamprovider.h similarity index 100% rename from LEGO1/mxdiskstreamprovider.h rename to LEGO1/omni/include/mxdiskstreamprovider.h diff --git a/LEGO1/mxdisplaysurface.h b/LEGO1/omni/include/mxdisplaysurface.h similarity index 100% rename from LEGO1/mxdisplaysurface.h rename to LEGO1/omni/include/mxdisplaysurface.h diff --git a/LEGO1/mxdsaction.h b/LEGO1/omni/include/mxdsaction.h similarity index 100% rename from LEGO1/mxdsaction.h rename to LEGO1/omni/include/mxdsaction.h diff --git a/LEGO1/mxdsactionlist.h b/LEGO1/omni/include/mxdsactionlist.h similarity index 100% rename from LEGO1/mxdsactionlist.h rename to LEGO1/omni/include/mxdsactionlist.h diff --git a/LEGO1/mxdsanim.h b/LEGO1/omni/include/mxdsanim.h similarity index 100% rename from LEGO1/mxdsanim.h rename to LEGO1/omni/include/mxdsanim.h diff --git a/LEGO1/mxdsbuffer.h b/LEGO1/omni/include/mxdsbuffer.h similarity index 100% rename from LEGO1/mxdsbuffer.h rename to LEGO1/omni/include/mxdsbuffer.h diff --git a/LEGO1/mxdschunk.h b/LEGO1/omni/include/mxdschunk.h similarity index 100% rename from LEGO1/mxdschunk.h rename to LEGO1/omni/include/mxdschunk.h diff --git a/LEGO1/mxdsevent.h b/LEGO1/omni/include/mxdsevent.h similarity index 100% rename from LEGO1/mxdsevent.h rename to LEGO1/omni/include/mxdsevent.h diff --git a/LEGO1/mxdsfile.h b/LEGO1/omni/include/mxdsfile.h similarity index 100% rename from LEGO1/mxdsfile.h rename to LEGO1/omni/include/mxdsfile.h diff --git a/LEGO1/mxdsmediaaction.h b/LEGO1/omni/include/mxdsmediaaction.h similarity index 100% rename from LEGO1/mxdsmediaaction.h rename to LEGO1/omni/include/mxdsmediaaction.h diff --git a/LEGO1/mxdsmultiaction.h b/LEGO1/omni/include/mxdsmultiaction.h similarity index 100% rename from LEGO1/mxdsmultiaction.h rename to LEGO1/omni/include/mxdsmultiaction.h diff --git a/LEGO1/mxdsobject.h b/LEGO1/omni/include/mxdsobject.h similarity index 100% rename from LEGO1/mxdsobject.h rename to LEGO1/omni/include/mxdsobject.h diff --git a/LEGO1/mxdsobjectaction.h b/LEGO1/omni/include/mxdsobjectaction.h similarity index 100% rename from LEGO1/mxdsobjectaction.h rename to LEGO1/omni/include/mxdsobjectaction.h diff --git a/LEGO1/mxdsparallelaction.h b/LEGO1/omni/include/mxdsparallelaction.h similarity index 100% rename from LEGO1/mxdsparallelaction.h rename to LEGO1/omni/include/mxdsparallelaction.h diff --git a/LEGO1/mxdsselectaction.h b/LEGO1/omni/include/mxdsselectaction.h similarity index 100% rename from LEGO1/mxdsselectaction.h rename to LEGO1/omni/include/mxdsselectaction.h diff --git a/LEGO1/mxdsserialaction.h b/LEGO1/omni/include/mxdsserialaction.h similarity index 100% rename from LEGO1/mxdsserialaction.h rename to LEGO1/omni/include/mxdsserialaction.h diff --git a/LEGO1/mxdssound.h b/LEGO1/omni/include/mxdssound.h similarity index 100% rename from LEGO1/mxdssound.h rename to LEGO1/omni/include/mxdssound.h diff --git a/LEGO1/mxdssource.h b/LEGO1/omni/include/mxdssource.h similarity index 100% rename from LEGO1/mxdssource.h rename to LEGO1/omni/include/mxdssource.h diff --git a/LEGO1/mxdsstill.h b/LEGO1/omni/include/mxdsstill.h similarity index 100% rename from LEGO1/mxdsstill.h rename to LEGO1/omni/include/mxdsstill.h diff --git a/LEGO1/mxdsstreamingaction.h b/LEGO1/omni/include/mxdsstreamingaction.h similarity index 100% rename from LEGO1/mxdsstreamingaction.h rename to LEGO1/omni/include/mxdsstreamingaction.h diff --git a/LEGO1/mxdssubscriber.h b/LEGO1/omni/include/mxdssubscriber.h similarity index 100% rename from LEGO1/mxdssubscriber.h rename to LEGO1/omni/include/mxdssubscriber.h diff --git a/LEGO1/mxdstypes.h b/LEGO1/omni/include/mxdstypes.h old mode 100755 new mode 100644 similarity index 100% rename from LEGO1/mxdstypes.h rename to LEGO1/omni/include/mxdstypes.h diff --git a/LEGO1/mxentity.h b/LEGO1/omni/include/mxentity.h similarity index 100% rename from LEGO1/mxentity.h rename to LEGO1/omni/include/mxentity.h diff --git a/LEGO1/mxeventmanager.h b/LEGO1/omni/include/mxeventmanager.h similarity index 100% rename from LEGO1/mxeventmanager.h rename to LEGO1/omni/include/mxeventmanager.h diff --git a/LEGO1/mxeventpresenter.h b/LEGO1/omni/include/mxeventpresenter.h similarity index 100% rename from LEGO1/mxeventpresenter.h rename to LEGO1/omni/include/mxeventpresenter.h diff --git a/LEGO1/mxflcpresenter.h b/LEGO1/omni/include/mxflcpresenter.h similarity index 100% rename from LEGO1/mxflcpresenter.h rename to LEGO1/omni/include/mxflcpresenter.h diff --git a/LEGO1/mxhashtable.h b/LEGO1/omni/include/mxhashtable.h similarity index 100% rename from LEGO1/mxhashtable.h rename to LEGO1/omni/include/mxhashtable.h diff --git a/LEGO1/mxioinfo.h b/LEGO1/omni/include/mxioinfo.h similarity index 100% rename from LEGO1/mxioinfo.h rename to LEGO1/omni/include/mxioinfo.h diff --git a/LEGO1/mxlist.h b/LEGO1/omni/include/mxlist.h similarity index 100% rename from LEGO1/mxlist.h rename to LEGO1/omni/include/mxlist.h diff --git a/LEGO1/mxloopingflcpresenter.h b/LEGO1/omni/include/mxloopingflcpresenter.h similarity index 100% rename from LEGO1/mxloopingflcpresenter.h rename to LEGO1/omni/include/mxloopingflcpresenter.h diff --git a/LEGO1/mxloopingmidipresenter.h b/LEGO1/omni/include/mxloopingmidipresenter.h similarity index 100% rename from LEGO1/mxloopingmidipresenter.h rename to LEGO1/omni/include/mxloopingmidipresenter.h diff --git a/LEGO1/mxloopingsmkpresenter.h b/LEGO1/omni/include/mxloopingsmkpresenter.h similarity index 100% rename from LEGO1/mxloopingsmkpresenter.h rename to LEGO1/omni/include/mxloopingsmkpresenter.h diff --git a/LEGO1/mxmediamanager.h b/LEGO1/omni/include/mxmediamanager.h similarity index 100% rename from LEGO1/mxmediamanager.h rename to LEGO1/omni/include/mxmediamanager.h diff --git a/LEGO1/mxmediapresenter.h b/LEGO1/omni/include/mxmediapresenter.h similarity index 100% rename from LEGO1/mxmediapresenter.h rename to LEGO1/omni/include/mxmediapresenter.h diff --git a/LEGO1/mxmidipresenter.h b/LEGO1/omni/include/mxmidipresenter.h similarity index 100% rename from LEGO1/mxmidipresenter.h rename to LEGO1/omni/include/mxmidipresenter.h diff --git a/LEGO1/mxmusicmanager.h b/LEGO1/omni/include/mxmusicmanager.h similarity index 100% rename from LEGO1/mxmusicmanager.h rename to LEGO1/omni/include/mxmusicmanager.h diff --git a/LEGO1/mxmusicpresenter.h b/LEGO1/omni/include/mxmusicpresenter.h similarity index 100% rename from LEGO1/mxmusicpresenter.h rename to LEGO1/omni/include/mxmusicpresenter.h diff --git a/LEGO1/mxnextactiondatastart.h b/LEGO1/omni/include/mxnextactiondatastart.h similarity index 100% rename from LEGO1/mxnextactiondatastart.h rename to LEGO1/omni/include/mxnextactiondatastart.h diff --git a/LEGO1/mxnotificationmanager.h b/LEGO1/omni/include/mxnotificationmanager.h similarity index 100% rename from LEGO1/mxnotificationmanager.h rename to LEGO1/omni/include/mxnotificationmanager.h diff --git a/LEGO1/mxnotificationparam.h b/LEGO1/omni/include/mxnotificationparam.h similarity index 100% rename from LEGO1/mxnotificationparam.h rename to LEGO1/omni/include/mxnotificationparam.h diff --git a/LEGO1/mxobjectfactory.h b/LEGO1/omni/include/mxobjectfactory.h similarity index 100% rename from LEGO1/mxobjectfactory.h rename to LEGO1/omni/include/mxobjectfactory.h diff --git a/LEGO1/mxomni.h b/LEGO1/omni/include/mxomni.h similarity index 100% rename from LEGO1/mxomni.h rename to LEGO1/omni/include/mxomni.h diff --git a/LEGO1/mxomnicreateflags.h b/LEGO1/omni/include/mxomnicreateflags.h similarity index 100% rename from LEGO1/mxomnicreateflags.h rename to LEGO1/omni/include/mxomnicreateflags.h diff --git a/LEGO1/mxomnicreateparam.h b/LEGO1/omni/include/mxomnicreateparam.h similarity index 100% rename from LEGO1/mxomnicreateparam.h rename to LEGO1/omni/include/mxomnicreateparam.h diff --git a/LEGO1/mxpalette.h b/LEGO1/omni/include/mxpalette.h similarity index 100% rename from LEGO1/mxpalette.h rename to LEGO1/omni/include/mxpalette.h diff --git a/LEGO1/mxparam.h b/LEGO1/omni/include/mxparam.h similarity index 100% rename from LEGO1/mxparam.h rename to LEGO1/omni/include/mxparam.h diff --git a/LEGO1/mxpoint32.h b/LEGO1/omni/include/mxpoint32.h old mode 100755 new mode 100644 similarity index 100% rename from LEGO1/mxpoint32.h rename to LEGO1/omni/include/mxpoint32.h diff --git a/LEGO1/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h similarity index 100% rename from LEGO1/mxpresenter.h rename to LEGO1/omni/include/mxpresenter.h diff --git a/LEGO1/mxpresenterlist.h b/LEGO1/omni/include/mxpresenterlist.h similarity index 100% rename from LEGO1/mxpresenterlist.h rename to LEGO1/omni/include/mxpresenterlist.h diff --git a/LEGO1/mxqueue.h b/LEGO1/omni/include/mxqueue.h similarity index 100% rename from LEGO1/mxqueue.h rename to LEGO1/omni/include/mxqueue.h diff --git a/LEGO1/mxramstreamcontroller.h b/LEGO1/omni/include/mxramstreamcontroller.h similarity index 100% rename from LEGO1/mxramstreamcontroller.h rename to LEGO1/omni/include/mxramstreamcontroller.h diff --git a/LEGO1/mxramstreamprovider.h b/LEGO1/omni/include/mxramstreamprovider.h similarity index 100% rename from LEGO1/mxramstreamprovider.h rename to LEGO1/omni/include/mxramstreamprovider.h diff --git a/LEGO1/mxrect32.h b/LEGO1/omni/include/mxrect32.h similarity index 100% rename from LEGO1/mxrect32.h rename to LEGO1/omni/include/mxrect32.h diff --git a/LEGO1/mxrectlist.h b/LEGO1/omni/include/mxrectlist.h similarity index 100% rename from LEGO1/mxrectlist.h rename to LEGO1/omni/include/mxrectlist.h diff --git a/LEGO1/mxregion.h b/LEGO1/omni/include/mxregion.h similarity index 100% rename from LEGO1/mxregion.h rename to LEGO1/omni/include/mxregion.h diff --git a/LEGO1/mxregioncursor.h b/LEGO1/omni/include/mxregioncursor.h similarity index 100% rename from LEGO1/mxregioncursor.h rename to LEGO1/omni/include/mxregioncursor.h diff --git a/LEGO1/mxregionlist.h b/LEGO1/omni/include/mxregionlist.h similarity index 100% rename from LEGO1/mxregionlist.h rename to LEGO1/omni/include/mxregionlist.h diff --git a/LEGO1/mxscheduler.h b/LEGO1/omni/include/mxscheduler.h similarity index 100% rename from LEGO1/mxscheduler.h rename to LEGO1/omni/include/mxscheduler.h diff --git a/LEGO1/mxsemaphore.h b/LEGO1/omni/include/mxsemaphore.h similarity index 100% rename from LEGO1/mxsemaphore.h rename to LEGO1/omni/include/mxsemaphore.h diff --git a/LEGO1/mxsize32.h b/LEGO1/omni/include/mxsize32.h similarity index 100% rename from LEGO1/mxsize32.h rename to LEGO1/omni/include/mxsize32.h diff --git a/LEGO1/mxsmack.h b/LEGO1/omni/include/mxsmack.h similarity index 100% rename from LEGO1/mxsmack.h rename to LEGO1/omni/include/mxsmack.h diff --git a/LEGO1/mxsmkpresenter.h b/LEGO1/omni/include/mxsmkpresenter.h similarity index 100% rename from LEGO1/mxsmkpresenter.h rename to LEGO1/omni/include/mxsmkpresenter.h diff --git a/LEGO1/mxsoundmanager.h b/LEGO1/omni/include/mxsoundmanager.h similarity index 100% rename from LEGO1/mxsoundmanager.h rename to LEGO1/omni/include/mxsoundmanager.h diff --git a/LEGO1/mxsoundpresenter.h b/LEGO1/omni/include/mxsoundpresenter.h similarity index 100% rename from LEGO1/mxsoundpresenter.h rename to LEGO1/omni/include/mxsoundpresenter.h diff --git a/LEGO1/mxstillpresenter.h b/LEGO1/omni/include/mxstillpresenter.h similarity index 100% rename from LEGO1/mxstillpresenter.h rename to LEGO1/omni/include/mxstillpresenter.h diff --git a/LEGO1/mxstreamchunk.h b/LEGO1/omni/include/mxstreamchunk.h similarity index 100% rename from LEGO1/mxstreamchunk.h rename to LEGO1/omni/include/mxstreamchunk.h diff --git a/LEGO1/mxstreamchunklist.h b/LEGO1/omni/include/mxstreamchunklist.h similarity index 100% rename from LEGO1/mxstreamchunklist.h rename to LEGO1/omni/include/mxstreamchunklist.h diff --git a/LEGO1/mxstreamcontroller.h b/LEGO1/omni/include/mxstreamcontroller.h similarity index 100% rename from LEGO1/mxstreamcontroller.h rename to LEGO1/omni/include/mxstreamcontroller.h diff --git a/LEGO1/mxstreamer.h b/LEGO1/omni/include/mxstreamer.h similarity index 100% rename from LEGO1/mxstreamer.h rename to LEGO1/omni/include/mxstreamer.h diff --git a/LEGO1/mxstreamlist.h b/LEGO1/omni/include/mxstreamlist.h similarity index 100% rename from LEGO1/mxstreamlist.h rename to LEGO1/omni/include/mxstreamlist.h diff --git a/LEGO1/mxstreamprovider.h b/LEGO1/omni/include/mxstreamprovider.h similarity index 100% rename from LEGO1/mxstreamprovider.h rename to LEGO1/omni/include/mxstreamprovider.h diff --git a/LEGO1/mxstring.h b/LEGO1/omni/include/mxstring.h similarity index 100% rename from LEGO1/mxstring.h rename to LEGO1/omni/include/mxstring.h diff --git a/LEGO1/mxstringlist.h b/LEGO1/omni/include/mxstringlist.h similarity index 100% rename from LEGO1/mxstringlist.h rename to LEGO1/omni/include/mxstringlist.h diff --git a/LEGO1/mxthread.h b/LEGO1/omni/include/mxthread.h similarity index 100% rename from LEGO1/mxthread.h rename to LEGO1/omni/include/mxthread.h diff --git a/LEGO1/mxticklemanager.h b/LEGO1/omni/include/mxticklemanager.h similarity index 100% rename from LEGO1/mxticklemanager.h rename to LEGO1/omni/include/mxticklemanager.h diff --git a/LEGO1/mxtimer.h b/LEGO1/omni/include/mxtimer.h similarity index 100% rename from LEGO1/mxtimer.h rename to LEGO1/omni/include/mxtimer.h diff --git a/LEGO1/mxtransitionmanager.h b/LEGO1/omni/include/mxtransitionmanager.h similarity index 100% rename from LEGO1/mxtransitionmanager.h rename to LEGO1/omni/include/mxtransitionmanager.h diff --git a/LEGO1/mxtype17notificationparam.h b/LEGO1/omni/include/mxtype17notificationparam.h similarity index 100% rename from LEGO1/mxtype17notificationparam.h rename to LEGO1/omni/include/mxtype17notificationparam.h diff --git a/LEGO1/mxtype18notificationparam.h b/LEGO1/omni/include/mxtype18notificationparam.h similarity index 100% rename from LEGO1/mxtype18notificationparam.h rename to LEGO1/omni/include/mxtype18notificationparam.h diff --git a/LEGO1/mxtype19notificationparam.h b/LEGO1/omni/include/mxtype19notificationparam.h similarity index 100% rename from LEGO1/mxtype19notificationparam.h rename to LEGO1/omni/include/mxtype19notificationparam.h diff --git a/LEGO1/mxtypes.h b/LEGO1/omni/include/mxtypes.h similarity index 100% rename from LEGO1/mxtypes.h rename to LEGO1/omni/include/mxtypes.h diff --git a/LEGO1/mxvariable.h b/LEGO1/omni/include/mxvariable.h similarity index 100% rename from LEGO1/mxvariable.h rename to LEGO1/omni/include/mxvariable.h diff --git a/LEGO1/mxvariabletable.h b/LEGO1/omni/include/mxvariabletable.h similarity index 100% rename from LEGO1/mxvariabletable.h rename to LEGO1/omni/include/mxvariabletable.h diff --git a/LEGO1/mxvideomanager.h b/LEGO1/omni/include/mxvideomanager.h similarity index 100% rename from LEGO1/mxvideomanager.h rename to LEGO1/omni/include/mxvideomanager.h diff --git a/LEGO1/mxvideoparam.h b/LEGO1/omni/include/mxvideoparam.h similarity index 100% rename from LEGO1/mxvideoparam.h rename to LEGO1/omni/include/mxvideoparam.h diff --git a/LEGO1/mxvideoparamflags.h b/LEGO1/omni/include/mxvideoparamflags.h similarity index 100% rename from LEGO1/mxvideoparamflags.h rename to LEGO1/omni/include/mxvideoparamflags.h diff --git a/LEGO1/mxvideopresenter.h b/LEGO1/omni/include/mxvideopresenter.h similarity index 100% rename from LEGO1/mxvideopresenter.h rename to LEGO1/omni/include/mxvideopresenter.h diff --git a/LEGO1/mxwavepresenter.h b/LEGO1/omni/include/mxwavepresenter.h similarity index 100% rename from LEGO1/mxwavepresenter.h rename to LEGO1/omni/include/mxwavepresenter.h diff --git a/LEGO1/mxdsaction.cpp b/LEGO1/omni/src/action/mxdsaction.cpp similarity index 100% rename from LEGO1/mxdsaction.cpp rename to LEGO1/omni/src/action/mxdsaction.cpp diff --git a/LEGO1/mxdsanim.cpp b/LEGO1/omni/src/action/mxdsanim.cpp similarity index 100% rename from LEGO1/mxdsanim.cpp rename to LEGO1/omni/src/action/mxdsanim.cpp diff --git a/LEGO1/mxdsevent.cpp b/LEGO1/omni/src/action/mxdsevent.cpp similarity index 100% rename from LEGO1/mxdsevent.cpp rename to LEGO1/omni/src/action/mxdsevent.cpp diff --git a/LEGO1/mxdsmediaaction.cpp b/LEGO1/omni/src/action/mxdsmediaaction.cpp similarity index 100% rename from LEGO1/mxdsmediaaction.cpp rename to LEGO1/omni/src/action/mxdsmediaaction.cpp diff --git a/LEGO1/mxdsmultiaction.cpp b/LEGO1/omni/src/action/mxdsmultiaction.cpp similarity index 100% rename from LEGO1/mxdsmultiaction.cpp rename to LEGO1/omni/src/action/mxdsmultiaction.cpp diff --git a/LEGO1/mxdsobject.cpp b/LEGO1/omni/src/action/mxdsobject.cpp similarity index 100% rename from LEGO1/mxdsobject.cpp rename to LEGO1/omni/src/action/mxdsobject.cpp diff --git a/LEGO1/mxdsobjectaction.cpp b/LEGO1/omni/src/action/mxdsobjectaction.cpp similarity index 100% rename from LEGO1/mxdsobjectaction.cpp rename to LEGO1/omni/src/action/mxdsobjectaction.cpp diff --git a/LEGO1/mxdsparallelaction.cpp b/LEGO1/omni/src/action/mxdsparallelaction.cpp similarity index 100% rename from LEGO1/mxdsparallelaction.cpp rename to LEGO1/omni/src/action/mxdsparallelaction.cpp diff --git a/LEGO1/mxdsselectaction.cpp b/LEGO1/omni/src/action/mxdsselectaction.cpp similarity index 100% rename from LEGO1/mxdsselectaction.cpp rename to LEGO1/omni/src/action/mxdsselectaction.cpp diff --git a/LEGO1/mxdsserialaction.cpp b/LEGO1/omni/src/action/mxdsserialaction.cpp similarity index 100% rename from LEGO1/mxdsserialaction.cpp rename to LEGO1/omni/src/action/mxdsserialaction.cpp diff --git a/LEGO1/mxdssound.cpp b/LEGO1/omni/src/action/mxdssound.cpp similarity index 100% rename from LEGO1/mxdssound.cpp rename to LEGO1/omni/src/action/mxdssound.cpp diff --git a/LEGO1/mxdsstill.cpp b/LEGO1/omni/src/action/mxdsstill.cpp similarity index 100% rename from LEGO1/mxdsstill.cpp rename to LEGO1/omni/src/action/mxdsstill.cpp diff --git a/LEGO1/mxdsstreamingaction.cpp b/LEGO1/omni/src/action/mxdsstreamingaction.cpp similarity index 100% rename from LEGO1/mxdsstreamingaction.cpp rename to LEGO1/omni/src/action/mxdsstreamingaction.cpp diff --git a/LEGO1/mxaudiomanager.cpp b/LEGO1/omni/src/audio/mxaudiomanager.cpp similarity index 100% rename from LEGO1/mxaudiomanager.cpp rename to LEGO1/omni/src/audio/mxaudiomanager.cpp diff --git a/LEGO1/mxaudiopresenter.cpp b/LEGO1/omni/src/audio/mxaudiopresenter.cpp similarity index 100% rename from LEGO1/mxaudiopresenter.cpp rename to LEGO1/omni/src/audio/mxaudiopresenter.cpp diff --git a/LEGO1/mxbackgroundaudiomanager.cpp b/LEGO1/omni/src/audio/mxbackgroundaudiomanager.cpp similarity index 100% rename from LEGO1/mxbackgroundaudiomanager.cpp rename to LEGO1/omni/src/audio/mxbackgroundaudiomanager.cpp diff --git a/LEGO1/mxloopingmidipresenter.cpp b/LEGO1/omni/src/audio/mxloopingmidipresenter.cpp similarity index 100% rename from LEGO1/mxloopingmidipresenter.cpp rename to LEGO1/omni/src/audio/mxloopingmidipresenter.cpp diff --git a/LEGO1/mxmidipresenter.cpp b/LEGO1/omni/src/audio/mxmidipresenter.cpp similarity index 100% rename from LEGO1/mxmidipresenter.cpp rename to LEGO1/omni/src/audio/mxmidipresenter.cpp diff --git a/LEGO1/mxmusicmanager.cpp b/LEGO1/omni/src/audio/mxmusicmanager.cpp similarity index 100% rename from LEGO1/mxmusicmanager.cpp rename to LEGO1/omni/src/audio/mxmusicmanager.cpp diff --git a/LEGO1/mxmusicpresenter.cpp b/LEGO1/omni/src/audio/mxmusicpresenter.cpp similarity index 100% rename from LEGO1/mxmusicpresenter.cpp rename to LEGO1/omni/src/audio/mxmusicpresenter.cpp diff --git a/LEGO1/mxsoundmanager.cpp b/LEGO1/omni/src/audio/mxsoundmanager.cpp similarity index 100% rename from LEGO1/mxsoundmanager.cpp rename to LEGO1/omni/src/audio/mxsoundmanager.cpp diff --git a/LEGO1/mxsoundpresenter.cpp b/LEGO1/omni/src/audio/mxsoundpresenter.cpp similarity index 100% rename from LEGO1/mxsoundpresenter.cpp rename to LEGO1/omni/src/audio/mxsoundpresenter.cpp diff --git a/LEGO1/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp similarity index 100% rename from LEGO1/mxwavepresenter.cpp rename to LEGO1/omni/src/audio/mxwavepresenter.cpp diff --git a/LEGO1/mxatomid.cpp b/LEGO1/omni/src/common/mxatomid.cpp similarity index 100% rename from LEGO1/mxatomid.cpp rename to LEGO1/omni/src/common/mxatomid.cpp diff --git a/LEGO1/mxatomidcounter.cpp b/LEGO1/omni/src/common/mxatomidcounter.cpp similarity index 100% rename from LEGO1/mxatomidcounter.cpp rename to LEGO1/omni/src/common/mxatomidcounter.cpp diff --git a/LEGO1/mxcompositemediapresenter.cpp b/LEGO1/omni/src/common/mxcompositemediapresenter.cpp similarity index 100% rename from LEGO1/mxcompositemediapresenter.cpp rename to LEGO1/omni/src/common/mxcompositemediapresenter.cpp diff --git a/LEGO1/mxcompositepresenter.cpp b/LEGO1/omni/src/common/mxcompositepresenter.cpp similarity index 100% rename from LEGO1/mxcompositepresenter.cpp rename to LEGO1/omni/src/common/mxcompositepresenter.cpp diff --git a/LEGO1/mxcore.cpp b/LEGO1/omni/src/common/mxcore.cpp similarity index 100% rename from LEGO1/mxcore.cpp rename to LEGO1/omni/src/common/mxcore.cpp diff --git a/LEGO1/mxmediamanager.cpp b/LEGO1/omni/src/common/mxmediamanager.cpp similarity index 100% rename from LEGO1/mxmediamanager.cpp rename to LEGO1/omni/src/common/mxmediamanager.cpp diff --git a/LEGO1/mxmediapresenter.cpp b/LEGO1/omni/src/common/mxmediapresenter.cpp similarity index 100% rename from LEGO1/mxmediapresenter.cpp rename to LEGO1/omni/src/common/mxmediapresenter.cpp diff --git a/LEGO1/mxobjectfactory.cpp b/LEGO1/omni/src/common/mxobjectfactory.cpp similarity index 100% rename from LEGO1/mxobjectfactory.cpp rename to LEGO1/omni/src/common/mxobjectfactory.cpp diff --git a/LEGO1/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp similarity index 100% rename from LEGO1/mxpresenter.cpp rename to LEGO1/omni/src/common/mxpresenter.cpp diff --git a/LEGO1/mxstring.cpp b/LEGO1/omni/src/common/mxstring.cpp similarity index 100% rename from LEGO1/mxstring.cpp rename to LEGO1/omni/src/common/mxstring.cpp diff --git a/LEGO1/mxticklemanager.cpp b/LEGO1/omni/src/common/mxticklemanager.cpp similarity index 100% rename from LEGO1/mxticklemanager.cpp rename to LEGO1/omni/src/common/mxticklemanager.cpp diff --git a/LEGO1/mxtimer.cpp b/LEGO1/omni/src/common/mxtimer.cpp similarity index 100% rename from LEGO1/mxtimer.cpp rename to LEGO1/omni/src/common/mxtimer.cpp diff --git a/LEGO1/mxvariable.cpp b/LEGO1/omni/src/common/mxvariable.cpp similarity index 100% rename from LEGO1/mxvariable.cpp rename to LEGO1/omni/src/common/mxvariable.cpp diff --git a/LEGO1/mxvariabletable.cpp b/LEGO1/omni/src/common/mxvariabletable.cpp similarity index 100% rename from LEGO1/mxvariabletable.cpp rename to LEGO1/omni/src/common/mxvariabletable.cpp diff --git a/LEGO1/mxcontrolpresenter.cpp b/LEGO1/omni/src/control/mxcontrolpresenter.cpp similarity index 100% rename from LEGO1/mxcontrolpresenter.cpp rename to LEGO1/omni/src/control/mxcontrolpresenter.cpp diff --git a/LEGO1/mxentity.cpp b/LEGO1/omni/src/entity/mxentity.cpp similarity index 100% rename from LEGO1/mxentity.cpp rename to LEGO1/omni/src/entity/mxentity.cpp diff --git a/LEGO1/mxeventmanager.cpp b/LEGO1/omni/src/event/mxeventmanager.cpp similarity index 100% rename from LEGO1/mxeventmanager.cpp rename to LEGO1/omni/src/event/mxeventmanager.cpp diff --git a/LEGO1/mxeventpresenter.cpp b/LEGO1/omni/src/event/mxeventpresenter.cpp similarity index 100% rename from LEGO1/mxeventpresenter.cpp rename to LEGO1/omni/src/event/mxeventpresenter.cpp diff --git a/LEGO1/dllmain.cpp b/LEGO1/omni/src/main/mxmain.cpp similarity index 100% rename from LEGO1/dllmain.cpp rename to LEGO1/omni/src/main/mxmain.cpp diff --git a/LEGO1/mxomni.cpp b/LEGO1/omni/src/main/mxomni.cpp similarity index 100% rename from LEGO1/mxomni.cpp rename to LEGO1/omni/src/main/mxomni.cpp diff --git a/LEGO1/mxomnicreateflags.cpp b/LEGO1/omni/src/main/mxomnicreateflags.cpp similarity index 100% rename from LEGO1/mxomnicreateflags.cpp rename to LEGO1/omni/src/main/mxomnicreateflags.cpp diff --git a/LEGO1/mxomnicreateparam.cpp b/LEGO1/omni/src/main/mxomnicreateparam.cpp similarity index 100% rename from LEGO1/mxomnicreateparam.cpp rename to LEGO1/omni/src/main/mxomnicreateparam.cpp diff --git a/LEGO1/mxactionnotificationparam.cpp b/LEGO1/omni/src/notify/mxactionnotificationparam.cpp similarity index 100% rename from LEGO1/mxactionnotificationparam.cpp rename to LEGO1/omni/src/notify/mxactionnotificationparam.cpp diff --git a/LEGO1/mxnotificationmanager.cpp b/LEGO1/omni/src/notify/mxnotificationmanager.cpp similarity index 100% rename from LEGO1/mxnotificationmanager.cpp rename to LEGO1/omni/src/notify/mxnotificationmanager.cpp diff --git a/LEGO1/mxnotificationparam.cpp b/LEGO1/omni/src/notify/mxnotificationparam.cpp similarity index 100% rename from LEGO1/mxnotificationparam.cpp rename to LEGO1/omni/src/notify/mxnotificationparam.cpp diff --git a/LEGO1/mxtype17notificationparam.cpp b/LEGO1/omni/src/notify/mxtype17notificationparam.cpp similarity index 100% rename from LEGO1/mxtype17notificationparam.cpp rename to LEGO1/omni/src/notify/mxtype17notificationparam.cpp diff --git a/LEGO1/mxdiskstreamcontroller.cpp b/LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp similarity index 100% rename from LEGO1/mxdiskstreamcontroller.cpp rename to LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp diff --git a/LEGO1/mxdiskstreamprovider.cpp b/LEGO1/omni/src/stream/mxdiskstreamprovider.cpp similarity index 100% rename from LEGO1/mxdiskstreamprovider.cpp rename to LEGO1/omni/src/stream/mxdiskstreamprovider.cpp diff --git a/LEGO1/mxdsbuffer.cpp b/LEGO1/omni/src/stream/mxdsbuffer.cpp similarity index 100% rename from LEGO1/mxdsbuffer.cpp rename to LEGO1/omni/src/stream/mxdsbuffer.cpp diff --git a/LEGO1/mxdschunk.cpp b/LEGO1/omni/src/stream/mxdschunk.cpp similarity index 100% rename from LEGO1/mxdschunk.cpp rename to LEGO1/omni/src/stream/mxdschunk.cpp diff --git a/LEGO1/mxdsfile.cpp b/LEGO1/omni/src/stream/mxdsfile.cpp similarity index 100% rename from LEGO1/mxdsfile.cpp rename to LEGO1/omni/src/stream/mxdsfile.cpp diff --git a/LEGO1/mxdssource.cpp b/LEGO1/omni/src/stream/mxdssource.cpp similarity index 100% rename from LEGO1/mxdssource.cpp rename to LEGO1/omni/src/stream/mxdssource.cpp diff --git a/LEGO1/mxdssubscriber.cpp b/LEGO1/omni/src/stream/mxdssubscriber.cpp similarity index 100% rename from LEGO1/mxdssubscriber.cpp rename to LEGO1/omni/src/stream/mxdssubscriber.cpp diff --git a/LEGO1/mxioinfo.cpp b/LEGO1/omni/src/stream/mxioinfo.cpp similarity index 100% rename from LEGO1/mxioinfo.cpp rename to LEGO1/omni/src/stream/mxioinfo.cpp diff --git a/LEGO1/mxramstreamcontroller.cpp b/LEGO1/omni/src/stream/mxramstreamcontroller.cpp similarity index 100% rename from LEGO1/mxramstreamcontroller.cpp rename to LEGO1/omni/src/stream/mxramstreamcontroller.cpp diff --git a/LEGO1/mxramstreamprovider.cpp b/LEGO1/omni/src/stream/mxramstreamprovider.cpp similarity index 100% rename from LEGO1/mxramstreamprovider.cpp rename to LEGO1/omni/src/stream/mxramstreamprovider.cpp diff --git a/LEGO1/mxstreamchunk.cpp b/LEGO1/omni/src/stream/mxstreamchunk.cpp similarity index 100% rename from LEGO1/mxstreamchunk.cpp rename to LEGO1/omni/src/stream/mxstreamchunk.cpp diff --git a/LEGO1/mxstreamcontroller.cpp b/LEGO1/omni/src/stream/mxstreamcontroller.cpp similarity index 100% rename from LEGO1/mxstreamcontroller.cpp rename to LEGO1/omni/src/stream/mxstreamcontroller.cpp diff --git a/LEGO1/mxstreamer.cpp b/LEGO1/omni/src/stream/mxstreamer.cpp similarity index 100% rename from LEGO1/mxstreamer.cpp rename to LEGO1/omni/src/stream/mxstreamer.cpp diff --git a/LEGO1/mxstreamlist.cpp b/LEGO1/omni/src/stream/mxstreamlist.cpp similarity index 100% rename from LEGO1/mxstreamlist.cpp rename to LEGO1/omni/src/stream/mxstreamlist.cpp diff --git a/LEGO1/mxstreamprovider.cpp b/LEGO1/omni/src/stream/mxstreamprovider.cpp similarity index 100% rename from LEGO1/mxstreamprovider.cpp rename to LEGO1/omni/src/stream/mxstreamprovider.cpp diff --git a/LEGO1/mxautolocker.cpp b/LEGO1/omni/src/system/mxautolocker.cpp similarity index 100% rename from LEGO1/mxautolocker.cpp rename to LEGO1/omni/src/system/mxautolocker.cpp diff --git a/LEGO1/mxcriticalsection.cpp b/LEGO1/omni/src/system/mxcriticalsection.cpp similarity index 100% rename from LEGO1/mxcriticalsection.cpp rename to LEGO1/omni/src/system/mxcriticalsection.cpp diff --git a/LEGO1/mxscheduler.cpp b/LEGO1/omni/src/system/mxscheduler.cpp similarity index 100% rename from LEGO1/mxscheduler.cpp rename to LEGO1/omni/src/system/mxscheduler.cpp diff --git a/LEGO1/mxsemaphore.cpp b/LEGO1/omni/src/system/mxsemaphore.cpp similarity index 100% rename from LEGO1/mxsemaphore.cpp rename to LEGO1/omni/src/system/mxsemaphore.cpp diff --git a/LEGO1/mxthread.cpp b/LEGO1/omni/src/system/mxthread.cpp similarity index 100% rename from LEGO1/mxthread.cpp rename to LEGO1/omni/src/system/mxthread.cpp diff --git a/LEGO1/mxbitmap.cpp b/LEGO1/omni/src/video/mxbitmap.cpp similarity index 100% rename from LEGO1/mxbitmap.cpp rename to LEGO1/omni/src/video/mxbitmap.cpp diff --git a/LEGO1/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp similarity index 100% rename from LEGO1/mxdisplaysurface.cpp rename to LEGO1/omni/src/video/mxdisplaysurface.cpp diff --git a/LEGO1/mxflcpresenter.cpp b/LEGO1/omni/src/video/mxflcpresenter.cpp similarity index 100% rename from LEGO1/mxflcpresenter.cpp rename to LEGO1/omni/src/video/mxflcpresenter.cpp diff --git a/LEGO1/mxloopingflcpresenter.cpp b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp similarity index 100% rename from LEGO1/mxloopingflcpresenter.cpp rename to LEGO1/omni/src/video/mxloopingflcpresenter.cpp diff --git a/LEGO1/mxloopingsmkpresenter.cpp b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp similarity index 100% rename from LEGO1/mxloopingsmkpresenter.cpp rename to LEGO1/omni/src/video/mxloopingsmkpresenter.cpp diff --git a/LEGO1/mxpalette.cpp b/LEGO1/omni/src/video/mxpalette.cpp similarity index 100% rename from LEGO1/mxpalette.cpp rename to LEGO1/omni/src/video/mxpalette.cpp diff --git a/LEGO1/mxregion.cpp b/LEGO1/omni/src/video/mxregion.cpp similarity index 100% rename from LEGO1/mxregion.cpp rename to LEGO1/omni/src/video/mxregion.cpp diff --git a/LEGO1/mxregioncursor.cpp b/LEGO1/omni/src/video/mxregioncursor.cpp similarity index 100% rename from LEGO1/mxregioncursor.cpp rename to LEGO1/omni/src/video/mxregioncursor.cpp diff --git a/LEGO1/mxsmack.cpp b/LEGO1/omni/src/video/mxsmack.cpp similarity index 100% rename from LEGO1/mxsmack.cpp rename to LEGO1/omni/src/video/mxsmack.cpp diff --git a/LEGO1/mxsmkpresenter.cpp b/LEGO1/omni/src/video/mxsmkpresenter.cpp similarity index 100% rename from LEGO1/mxsmkpresenter.cpp rename to LEGO1/omni/src/video/mxsmkpresenter.cpp diff --git a/LEGO1/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp similarity index 100% rename from LEGO1/mxstillpresenter.cpp rename to LEGO1/omni/src/video/mxstillpresenter.cpp diff --git a/LEGO1/mxtransitionmanager.cpp b/LEGO1/omni/src/video/mxtransitionmanager.cpp similarity index 100% rename from LEGO1/mxtransitionmanager.cpp rename to LEGO1/omni/src/video/mxtransitionmanager.cpp diff --git a/LEGO1/mxvideomanager.cpp b/LEGO1/omni/src/video/mxvideomanager.cpp similarity index 100% rename from LEGO1/mxvideomanager.cpp rename to LEGO1/omni/src/video/mxvideomanager.cpp diff --git a/LEGO1/mxvideoparam.cpp b/LEGO1/omni/src/video/mxvideoparam.cpp similarity index 100% rename from LEGO1/mxvideoparam.cpp rename to LEGO1/omni/src/video/mxvideoparam.cpp diff --git a/LEGO1/mxvideoparamflags.cpp b/LEGO1/omni/src/video/mxvideoparamflags.cpp similarity index 100% rename from LEGO1/mxvideoparamflags.cpp rename to LEGO1/omni/src/video/mxvideoparamflags.cpp diff --git a/LEGO1/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp similarity index 100% rename from LEGO1/mxvideopresenter.cpp rename to LEGO1/omni/src/video/mxvideopresenter.cpp diff --git a/LEGO1/realtime/roi.h b/LEGO1/realtime/roi.h index 287407ac..c8458cd7 100644 --- a/LEGO1/realtime/roi.h +++ b/LEGO1/realtime/roi.h @@ -3,10 +3,10 @@ // ROI stands for Real-time Object Instance. -#include "../mxstl/stlcompat.h" -#include "../realtime/realtime.h" #include "compat.h" #include "lodlist.h" +#include "mxstl/stlcompat.h" +#include "realtime/realtime.h" #include "vector.h" /* diff --git a/LEGO1/res/resource.h b/LEGO1/res/resource.h index d11b6281..5a51e019 100644 --- a/LEGO1/res/resource.h +++ b/LEGO1/res/resource.h @@ -1,12 +1,12 @@ -#define LEGO1_ARROW 101 -#define LEGO1_LEAF4 102 -#define LEGO1_LEAF7 103 -#define LEGO1_LEAF1 104 -#define LEGO1_LEAF2 105 -#define LEGO1_LEAF6 106 -#define LEGO1_LEAF0 107 -#define LEGO1_LEAF5 108 -#define LEGO1_LEAF3 109 -#define LEGO1_BUSY 111 +#define LEGO1_ARROW 101 +#define LEGO1_LEAF4 102 +#define LEGO1_LEAF7 103 +#define LEGO1_LEAF1 104 +#define LEGO1_LEAF2 105 +#define LEGO1_LEAF6 106 +#define LEGO1_LEAF0 107 +#define LEGO1_LEAF5 108 +#define LEGO1_LEAF3 109 +#define LEGO1_BUSY 111 -#define APP_ICON 105 +#define APP_ICON 105 diff --git a/LEGO1/tgl/d3drm/impl.h b/LEGO1/tgl/d3drm/impl.h index cf14ada1..4c76a365 100644 --- a/LEGO1/tgl/d3drm/impl.h +++ b/LEGO1/tgl/d3drm/impl.h @@ -1,7 +1,7 @@ -#include "../tgl.h" #include "compat.h" #include "decomp.h" +#include "tgl/tgl.h" #include diff --git a/LEGO1/viewmanager/viewlodlist.h b/LEGO1/viewmanager/viewlodlist.h index 4d848533..9dc06d7b 100644 --- a/LEGO1/viewmanager/viewlodlist.h +++ b/LEGO1/viewmanager/viewlodlist.h @@ -1,10 +1,10 @@ #ifndef VIEWLODLIST_H #define VIEWLODLIST_H -#include "../mxstl/stlcompat.h" -#include "../realtime/lodlist.h" #include "assert.h" #include "compat.h" +#include "mxstl/stlcompat.h" +#include "realtime/lodlist.h" #include diff --git a/LEGO1/viewmanager/viewroi.h b/LEGO1/viewmanager/viewroi.h index fb2e8e54..02d69ab5 100644 --- a/LEGO1/viewmanager/viewroi.h +++ b/LEGO1/viewmanager/viewroi.h @@ -1,9 +1,9 @@ #ifndef VIEWROI_H #define VIEWROI_H -#include "../realtime/orientableroi.h" -#include "../tgl/tgl.h" #include "decomp.h" +#include "realtime/orientableroi.h" +#include "tgl/tgl.h" #include "viewlodlist.h" /* diff --git a/tools/isledecomp/.gitignore b/tools/isledecomp/.gitignore index 00aa29cb..a7c50887 100644 --- a/tools/isledecomp/.gitignore +++ b/tools/isledecomp/.gitignore @@ -1 +1,2 @@ -isledecomp.egg-info/ \ No newline at end of file +isledecomp.egg-info/ +build \ No newline at end of file From 091ecd5935c1b61f42dc8a55c0793154708d14d3 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Mon, 8 Jan 2024 06:45:07 -0500 Subject: [PATCH 2/9] Move some classes to LegoOmni (#417) --- CMakeLists.txt | 7 +- LEGO1/lego/legoomni/include/legoomni.h | 17 -- LEGO1/lego/legoomni/include/legoutil.h | 51 +----- .../include/mxbackgroundaudiomanager.h | 0 .../include/mxcompositemediapresenter.h | 0 .../legoomni}/include/mxtransitionmanager.h | 0 .../src/audio/mxbackgroundaudiomanager.cpp | 0 .../src/common/mxcompositemediapresenter.cpp | 0 LEGO1/lego/legoomni/src/main/legoomni.cpp | 144 ----------------- .../src/video/mxtransitionmanager.cpp | 0 LEGO1/omni/include/mxutil.h | 75 +++++++++ LEGO1/omni/src/action/mxdsaction.cpp | 2 +- LEGO1/omni/src/action/mxdsmediaaction.cpp | 2 +- LEGO1/omni/src/action/mxdsobject.cpp | 2 +- LEGO1/omni/src/action/mxdssound.cpp | 2 +- LEGO1/omni/src/audio/mxmidipresenter.cpp | 1 - LEGO1/omni/src/audio/mxwavepresenter.cpp | 2 +- LEGO1/omni/src/common/mxpresenter.cpp | 4 +- LEGO1/omni/src/common/mxutil.cpp | 149 ++++++++++++++++++ LEGO1/omni/src/control/mxcontrolpresenter.cpp | 1 - .../omni/src/notify/mxnotificationmanager.cpp | 2 +- LEGO1/omni/src/stream/mxstreamchunk.cpp | 2 +- LEGO1/omni/src/stream/mxstreamcontroller.cpp | 4 +- LEGO1/omni/src/stream/mxstreamer.cpp | 2 +- LEGO1/omni/src/video/mxdisplaysurface.cpp | 2 +- LEGO1/omni/src/video/mxstillpresenter.cpp | 2 +- LEGO1/omni/src/video/mxvideomanager.cpp | 1 - 27 files changed, 245 insertions(+), 229 deletions(-) rename LEGO1/{omni => lego/legoomni}/include/mxbackgroundaudiomanager.h (100%) rename LEGO1/{omni => lego/legoomni}/include/mxcompositemediapresenter.h (100%) rename LEGO1/{omni => lego/legoomni}/include/mxtransitionmanager.h (100%) rename LEGO1/{omni => lego/legoomni}/src/audio/mxbackgroundaudiomanager.cpp (100%) rename LEGO1/{omni => lego/legoomni}/src/common/mxcompositemediapresenter.cpp (100%) rename LEGO1/{omni => lego/legoomni}/src/video/mxtransitionmanager.cpp (100%) create mode 100644 LEGO1/omni/include/mxutil.h create mode 100644 LEGO1/omni/src/common/mxutil.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 10f30c5b..eb5f1c25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,7 @@ add_library(lego1 SHARED LEGO1/lego/legoomni/src/audio/legocachesound.cpp LEGO1/lego/legoomni/src/audio/legoloadcachesoundpresenter.cpp LEGO1/lego/legoomni/src/audio/legosoundmanager.cpp + LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp LEGO1/lego/legoomni/src/build/buildingentity.cpp LEGO1/lego/legoomni/src/build/dunebuggy.cpp LEGO1/lego/legoomni/src/build/helicopter.cpp @@ -41,6 +42,7 @@ add_library(lego1 SHARED LEGO1/lego/legoomni/src/common/legostream.cpp LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp LEGO1/lego/legoomni/src/common/legoutil.cpp + LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp LEGO1/lego/legoomni/src/entity/legoactor.cpp LEGO1/lego/legoomni/src/entity/legoanimactor.cpp @@ -114,6 +116,7 @@ add_library(lego1 SHARED LEGO1/lego/legoomni/src/video/legophonemepresenter.cpp LEGO1/lego/legoomni/src/video/legotexturepresenter.cpp LEGO1/lego/legoomni/src/video/legovideomanager.cpp + LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp LEGO1/lego/sources/3dmanager/lego3dmanager.cpp LEGO1/lego/sources/3dmanager/lego3dview.cpp LEGO1/lego/sources/3dmanager/legoview1.cpp @@ -136,7 +139,6 @@ add_library(lego1 SHARED LEGO1/omni/src/action/mxdsstreamingaction.cpp LEGO1/omni/src/audio/mxaudiomanager.cpp LEGO1/omni/src/audio/mxaudiopresenter.cpp - LEGO1/omni/src/audio/mxbackgroundaudiomanager.cpp LEGO1/omni/src/audio/mxloopingmidipresenter.cpp LEGO1/omni/src/audio/mxmidipresenter.cpp LEGO1/omni/src/audio/mxmusicmanager.cpp @@ -146,7 +148,6 @@ add_library(lego1 SHARED LEGO1/omni/src/audio/mxwavepresenter.cpp LEGO1/omni/src/common/mxatomidcounter.cpp LEGO1/omni/src/common/mxatomid.cpp - LEGO1/omni/src/common/mxcompositemediapresenter.cpp LEGO1/omni/src/common/mxcompositepresenter.cpp LEGO1/omni/src/common/mxcore.cpp LEGO1/omni/src/common/mxmediamanager.cpp @@ -156,6 +157,7 @@ add_library(lego1 SHARED LEGO1/omni/src/common/mxstring.cpp LEGO1/omni/src/common/mxticklemanager.cpp LEGO1/omni/src/common/mxtimer.cpp + LEGO1/omni/src/common/mxutil.cpp LEGO1/omni/src/common/mxvariable.cpp LEGO1/omni/src/common/mxvariabletable.cpp LEGO1/omni/src/control/mxcontrolpresenter.cpp @@ -201,7 +203,6 @@ add_library(lego1 SHARED LEGO1/omni/src/video/mxsmack.cpp LEGO1/omni/src/video/mxsmkpresenter.cpp LEGO1/omni/src/video/mxstillpresenter.cpp - LEGO1/omni/src/video/mxtransitionmanager.cpp LEGO1/omni/src/video/mxvideomanager.cpp LEGO1/omni/src/video/mxvideoparam.cpp LEGO1/omni/src/video/mxvideoparamflags.cpp diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h index 613ddd85..77cf47f5 100644 --- a/LEGO1/lego/legoomni/include/legoomni.h +++ b/LEGO1/lego/legoomni/include/legoomni.h @@ -140,15 +140,12 @@ class LegoOmni : public MxOmni { }; __declspec(dllexport) MxBackgroundAudioManager* BackgroundAudioManager(); -__declspec(dllexport) MxDSObject* CreateStreamObject(MxDSFile*, MxS16); __declspec(dllexport) LegoGameState* GameState(); __declspec(dllexport) const char* GetNoCD_SourceName(); __declspec(dllexport) LegoInputManager* InputManager(); __declspec(dllexport) LegoOmni* Lego(); -__declspec(dllexport) void MakeSourceName(char*, const char*); __declspec(dllexport) LegoEntity* PickEntity(MxLong, MxLong); __declspec(dllexport) LegoROI* PickROI(MxLong, MxLong); -__declspec(dllexport) void SetOmniUserMessage(void (*)(const char*, int)); __declspec(dllexport) LegoSoundManager* SoundManager(); __declspec(dllexport) MxResult Start(MxDSAction*); __declspec(dllexport) MxTransitionManager* TransitionManager(); @@ -159,26 +156,12 @@ LegoBuildingManager* BuildingManager(); LegoControlManager* ControlManager(); IslePathActor* GetCurrentVehicle(); LegoPlantManager* PlantManager(); -MxBool KeyValueStringParse(char*, const char*, const char*); LegoWorld* GetCurrentWorld(); GifManager* GetGifManager(); void FUN_10015820(MxU32, MxU32); LegoEntity* FindEntityByAtomIdOrEntityId(const MxAtomId& p_atom, MxS32 p_entityid); MxDSAction& GetCurrentAction(); -MxBool FUN_100b6e10( - MxS32 p_bitmapWidth, - MxS32 p_bitmapHeight, - MxS32 p_videoParamWidth, - MxS32 p_videoParamHeight, - MxS32* p_left, - MxS32* p_top, - MxS32* p_right, - MxS32* p_bottom, - MxS32* p_width, - MxS32* p_height -); - void PlayMusic(MxU32 p_index); void SetIsWorldActive(MxBool p_isWorldActive); void RegisterScripts(); diff --git a/LEGO1/lego/legoomni/include/legoutil.h b/LEGO1/lego/legoomni/include/legoutil.h index 827b8488..1539f28f 100644 --- a/LEGO1/lego/legoomni/include/legoutil.h +++ b/LEGO1/lego/legoomni/include/legoutil.h @@ -2,58 +2,13 @@ #define LEGOUTIL_H #include "extra.h" -#include "legoentity.h" -#include "mxatomid.h" #include "mxtypes.h" +#include "mxutil.h" #include -template -inline T Abs(T p_t) -{ - return p_t < 0 ? -p_t : p_t; -} - -template -inline T Min(T p_t1, T p_t2) -{ - return p_t1 < p_t2 ? p_t1 : p_t2; -} - -template -inline T Max(T p_t1, T p_t2) -{ - return p_t1 > p_t2 ? p_t1 : p_t2; -} - -template -inline void GetScalar(MxU8** p_source, T& p_dest) -{ - p_dest = *(T*) *p_source; - *p_source += sizeof(T); -} - -template -inline T GetScalar(T** p_source) -{ - T val = **p_source; - *p_source += 1; - return val; -} - -template -inline void GetDouble(MxU8** p_source, T& p_dest) -{ - p_dest = *(double*) *p_source; - *p_source += sizeof(double); -} - -template -inline void GetString(MxU8** p_source, char** p_dest, T* p_obj, void (T::*p_setter)(const char*)) -{ - (p_obj->*p_setter)((char*) *p_source); - *p_source += strlen(*p_dest) + 1; -} +class MxAtomId; +class LegoEntity; ExtraActionType MatchActionString(const char*); void InvokeAction(ExtraActionType p_actionId, MxAtomId& p_pAtom, int p_targetEntityId, LegoEntity* p_sender); diff --git a/LEGO1/omni/include/mxbackgroundaudiomanager.h b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h similarity index 100% rename from LEGO1/omni/include/mxbackgroundaudiomanager.h rename to LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h diff --git a/LEGO1/omni/include/mxcompositemediapresenter.h b/LEGO1/lego/legoomni/include/mxcompositemediapresenter.h similarity index 100% rename from LEGO1/omni/include/mxcompositemediapresenter.h rename to LEGO1/lego/legoomni/include/mxcompositemediapresenter.h diff --git a/LEGO1/omni/include/mxtransitionmanager.h b/LEGO1/lego/legoomni/include/mxtransitionmanager.h similarity index 100% rename from LEGO1/omni/include/mxtransitionmanager.h rename to LEGO1/lego/legoomni/include/mxtransitionmanager.h diff --git a/LEGO1/omni/src/audio/mxbackgroundaudiomanager.cpp b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp similarity index 100% rename from LEGO1/omni/src/audio/mxbackgroundaudiomanager.cpp rename to LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp diff --git a/LEGO1/omni/src/common/mxcompositemediapresenter.cpp b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp similarity index 100% rename from LEGO1/omni/src/common/mxcompositemediapresenter.cpp rename to LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp diff --git a/LEGO1/lego/legoomni/src/main/legoomni.cpp b/LEGO1/lego/legoomni/src/main/legoomni.cpp index 29150f95..9f27a980 100644 --- a/LEGO1/lego/legoomni/src/main/legoomni.cpp +++ b/LEGO1/lego/legoomni/src/main/legoomni.cpp @@ -111,9 +111,6 @@ MxAtomId* g_nocdSourceName = NULL; // GLOBAL: LEGO1 0x100f6718 const char* g_current = "current"; -// GLOBAL: LEGO1 0x101020e8 -void (*g_omniUserMessage)(const char*, int); - // GLOBAL: LEGO1 0x100f4c58 MxBool g_isWorldActive = TRUE; @@ -694,144 +691,3 @@ MxResult Start(MxDSAction* p_dsAction) { return MxOmni::GetInstance()->Start(p_dsAction); } - -// Probably should be somewhere else -// FUNCTION: LEGO1 0x100b6e10 -MxBool FUN_100b6e10( - MxS32 p_bitmapWidth, - MxS32 p_bitmapHeight, - MxS32 p_videoParamWidth, - MxS32 p_videoParamHeight, - MxS32* p_left, - MxS32* p_top, - MxS32* p_right, - MxS32* p_bottom, - MxS32* p_width, - MxS32* p_height -) -{ - MxPoint32 topLeft(*p_left, *p_top); - MxRect32 bitmapRect(MxPoint32(0, 0), MxSize32(p_bitmapWidth, p_bitmapHeight)); - - MxPoint32 bottomRight(*p_right, *p_bottom); - MxRect32 videoParamRect(MxPoint32(0, 0), MxSize32(p_videoParamWidth, p_videoParamHeight)); - - MxRect32 rect(0, 0, *p_width, *p_height); - rect.AddPoint(topLeft); - - if (!rect.IntersectsWith(bitmapRect)) - return FALSE; - - rect.Intersect(bitmapRect); - rect.SubtractPoint(topLeft); - rect.AddPoint(bottomRight); - - if (!rect.IntersectsWith(videoParamRect)) - return FALSE; - - rect.Intersect(videoParamRect); - rect.SubtractPoint(bottomRight); - - *p_left += rect.GetLeft(); - *p_top += rect.GetTop(); - *p_right += rect.GetLeft(); - *p_bottom += rect.GetTop(); - *p_width = rect.GetWidth(); - *p_height = rect.GetHeight(); - return TRUE; -} - -// FUNCTION: LEGO1 0x100b6ff0 -void MakeSourceName(char* p_output, const char* p_input) -{ - const char* cln = strchr(p_input, ':'); - if (cln) { - p_input = cln + 1; - } - - strcpy(p_output, p_input); - - strlwr(p_output); - - char* extLoc = strstr(p_output, ".si"); - if (extLoc) { - *extLoc = 0; - } -} - -// FUNCTION: LEGO1 0x100b7050 -MxBool KeyValueStringParse(char* p_outputValue, const char* p_key, const char* p_source) -{ - MxBool didMatch = FALSE; - - MxS16 len = strlen(p_source); - char* temp = new char[len + 1]; - strcpy(temp, p_source); - - char* token = strtok(temp, ", \t\r\n:"); - while (token) { - len -= (strlen(token) + 1); - - if (strcmpi(token, p_key) == 0) { - if (p_outputValue && len > 0) { - char* cur = &token[strlen(p_key)]; - cur++; - while (*cur != ',') { - if (*cur == ' ' || *cur == '\0' || *cur == '\t' || *cur == '\n' || *cur == '\r') - break; - *p_outputValue++ = *cur++; - } - *p_outputValue = '\0'; - } - - didMatch = TRUE; - break; - } - - token = strtok(NULL, ", \t\r\n:"); - } - - delete[] temp; - return didMatch; -} - -// FUNCTION: LEGO1 0x100b7210 -void SetOmniUserMessage(void (*p_userMsg)(const char*, int)) -{ - g_omniUserMessage = p_userMsg; -} - -// FUNCTION: LEGO1 0x100c0280 -MxDSObject* CreateStreamObject(MxDSFile* p_file, MxS16 p_ofs) -{ - MxU8* buf; - _MMCKINFO tmpChunk; - - if (p_file->Seek(((MxLong*) p_file->GetBuffer())[p_ofs], 0)) { - return NULL; - } - - if (p_file->Read((MxU8*) &tmpChunk.ckid, 8) == 0 && tmpChunk.ckid == FOURCC('M', 'x', 'S', 't')) { - if (p_file->Read((MxU8*) &tmpChunk.ckid, 8) == 0 && tmpChunk.ckid == FOURCC('M', 'x', 'O', 'b')) { - - buf = new MxU8[tmpChunk.cksize]; - if (!buf) { - return NULL; - } - - if (p_file->Read(buf, tmpChunk.cksize) != 0) { - return NULL; - } - - // Save a copy so we can clean up properly, because - // this function will alter the pointer value. - MxU8* copy = buf; - MxDSObject* obj = DeserializeDSObjectDispatch(&buf, -1); - delete[] copy; - return obj; - } - return NULL; - } - - return NULL; -} diff --git a/LEGO1/omni/src/video/mxtransitionmanager.cpp b/LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp similarity index 100% rename from LEGO1/omni/src/video/mxtransitionmanager.cpp rename to LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp diff --git a/LEGO1/omni/include/mxutil.h b/LEGO1/omni/include/mxutil.h new file mode 100644 index 00000000..f9febef1 --- /dev/null +++ b/LEGO1/omni/include/mxutil.h @@ -0,0 +1,75 @@ +#ifndef MXUTIL_H +#define MXUTIL_H + +#include "mxtypes.h" + +class MxDSFile; +class MxDSObject; + +template +inline T Abs(T p_t) +{ + return p_t < 0 ? -p_t : p_t; +} + +template +inline T Min(T p_t1, T p_t2) +{ + return p_t1 < p_t2 ? p_t1 : p_t2; +} + +template +inline T Max(T p_t1, T p_t2) +{ + return p_t1 > p_t2 ? p_t1 : p_t2; +} + +template +inline void GetScalar(MxU8** p_source, T& p_dest) +{ + p_dest = *(T*) *p_source; + *p_source += sizeof(T); +} + +template +inline T GetScalar(T** p_source) +{ + T val = **p_source; + *p_source += 1; + return val; +} + +template +inline void GetDouble(MxU8** p_source, T& p_dest) +{ + p_dest = *(double*) *p_source; + *p_source += sizeof(double); +} + +template +inline void GetString(MxU8** p_source, char** p_dest, T* p_obj, void (T::*p_setter)(const char*)) +{ + (p_obj->*p_setter)((char*) *p_source); + *p_source += strlen(*p_dest) + 1; +} + +MxBool FUN_100b6e10( + MxS32 p_bitmapWidth, + MxS32 p_bitmapHeight, + MxS32 p_videoParamWidth, + MxS32 p_videoParamHeight, + MxS32* p_left, + MxS32* p_top, + MxS32* p_right, + MxS32* p_bottom, + MxS32* p_width, + MxS32* p_height +); + +__declspec(dllexport) void MakeSourceName(char*, const char*); +__declspec(dllexport) void SetOmniUserMessage(void (*)(const char*, int)); +__declspec(dllexport) MxDSObject* CreateStreamObject(MxDSFile*, MxS16); + +MxBool KeyValueStringParse(char*, const char*, const char*); + +#endif // MXUTIL_H diff --git a/LEGO1/omni/src/action/mxdsaction.cpp b/LEGO1/omni/src/action/mxdsaction.cpp index 36533a1a..b24ff347 100644 --- a/LEGO1/omni/src/action/mxdsaction.cpp +++ b/LEGO1/omni/src/action/mxdsaction.cpp @@ -1,8 +1,8 @@ #include "mxdsaction.h" -#include "legoutil.h" #include "mxomni.h" #include "mxtimer.h" +#include "mxutil.h" #include #include diff --git a/LEGO1/omni/src/action/mxdsmediaaction.cpp b/LEGO1/omni/src/action/mxdsmediaaction.cpp index fb9425d2..c631dec8 100644 --- a/LEGO1/omni/src/action/mxdsmediaaction.cpp +++ b/LEGO1/omni/src/action/mxdsmediaaction.cpp @@ -1,6 +1,6 @@ #include "mxdsmediaaction.h" -#include "legoutil.h" +#include "mxutil.h" DECOMP_SIZE_ASSERT(MxDSMediaAction, 0xb8) diff --git a/LEGO1/omni/src/action/mxdsobject.cpp b/LEGO1/omni/src/action/mxdsobject.cpp index 9a5801d1..7ee92937 100644 --- a/LEGO1/omni/src/action/mxdsobject.cpp +++ b/LEGO1/omni/src/action/mxdsobject.cpp @@ -1,6 +1,5 @@ #include "mxdsobject.h" -#include "legoutil.h" #include "mxdsaction.h" #include "mxdsanim.h" #include "mxdsevent.h" @@ -13,6 +12,7 @@ #include "mxdssound.h" #include "mxdsstill.h" #include "mxdstypes.h" +#include "mxutil.h" #include #include diff --git a/LEGO1/omni/src/action/mxdssound.cpp b/LEGO1/omni/src/action/mxdssound.cpp index 359ff906..49806ce0 100644 --- a/LEGO1/omni/src/action/mxdssound.cpp +++ b/LEGO1/omni/src/action/mxdssound.cpp @@ -1,6 +1,6 @@ #include "mxdssound.h" -#include "legoutil.h" +#include "mxutil.h" DECOMP_SIZE_ASSERT(MxDSSound, 0xc0) diff --git a/LEGO1/omni/src/audio/mxmidipresenter.cpp b/LEGO1/omni/src/audio/mxmidipresenter.cpp index b648eff7..ebf6ab68 100644 --- a/LEGO1/omni/src/audio/mxmidipresenter.cpp +++ b/LEGO1/omni/src/audio/mxmidipresenter.cpp @@ -1,7 +1,6 @@ #include "mxmidipresenter.h" #include "decomp.h" -#include "legoomni.h" #include "mxautolocker.h" #include "mxdssound.h" #include "mxmusicmanager.h" diff --git a/LEGO1/omni/src/audio/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp index 6d08a899..9c141781 100644 --- a/LEGO1/omni/src/audio/mxwavepresenter.cpp +++ b/LEGO1/omni/src/audio/mxwavepresenter.cpp @@ -2,11 +2,11 @@ #include "decomp.h" #include "define.h" -#include "legoomni.h" #include "mxautolocker.h" #include "mxdssound.h" #include "mxomni.h" #include "mxsoundmanager.h" +#include "mxutil.h" DECOMP_SIZE_ASSERT(MxWavePresenter, 0x6c); DECOMP_SIZE_ASSERT(MxWavePresenter::WaveFormat, 0x1c); diff --git a/LEGO1/omni/src/common/mxpresenter.cpp b/LEGO1/omni/src/common/mxpresenter.cpp index 0640d550..0595aee7 100644 --- a/LEGO1/omni/src/common/mxpresenter.cpp +++ b/LEGO1/omni/src/common/mxpresenter.cpp @@ -2,8 +2,6 @@ #include "decomp.h" #include "define.h" -#include "legoobjectfactory.h" -#include "legoomni.h" #include "mxactionnotificationparam.h" #include "mxautolocker.h" #include "mxcompositepresenter.h" @@ -11,8 +9,10 @@ #include "mxdssound.h" #include "mxentity.h" #include "mxnotificationmanager.h" +#include "mxobjectfactory.h" #include "mxparam.h" #include "mxstreamer.h" +#include "mxutil.h" #include diff --git a/LEGO1/omni/src/common/mxutil.cpp b/LEGO1/omni/src/common/mxutil.cpp new file mode 100644 index 00000000..538368d1 --- /dev/null +++ b/LEGO1/omni/src/common/mxutil.cpp @@ -0,0 +1,149 @@ +#include "mxutil.h" + +#include "mxdsfile.h" +#include "mxdsobject.h" +#include "mxrect32.h" + +// GLOBAL: LEGO1 0x101020e8 +void (*g_omniUserMessage)(const char*, int); + +// FUNCTION: LEGO1 0x100b6e10 +MxBool FUN_100b6e10( + MxS32 p_bitmapWidth, + MxS32 p_bitmapHeight, + MxS32 p_videoParamWidth, + MxS32 p_videoParamHeight, + MxS32* p_left, + MxS32* p_top, + MxS32* p_right, + MxS32* p_bottom, + MxS32* p_width, + MxS32* p_height +) +{ + MxPoint32 topLeft(*p_left, *p_top); + MxRect32 bitmapRect(MxPoint32(0, 0), MxSize32(p_bitmapWidth, p_bitmapHeight)); + + MxPoint32 bottomRight(*p_right, *p_bottom); + MxRect32 videoParamRect(MxPoint32(0, 0), MxSize32(p_videoParamWidth, p_videoParamHeight)); + + MxRect32 rect(0, 0, *p_width, *p_height); + rect.AddPoint(topLeft); + + if (!rect.IntersectsWith(bitmapRect)) + return FALSE; + + rect.Intersect(bitmapRect); + rect.SubtractPoint(topLeft); + rect.AddPoint(bottomRight); + + if (!rect.IntersectsWith(videoParamRect)) + return FALSE; + + rect.Intersect(videoParamRect); + rect.SubtractPoint(bottomRight); + + *p_left += rect.GetLeft(); + *p_top += rect.GetTop(); + *p_right += rect.GetLeft(); + *p_bottom += rect.GetTop(); + *p_width = rect.GetWidth(); + *p_height = rect.GetHeight(); + return TRUE; +} + +// FUNCTION: LEGO1 0x100b6ff0 +void MakeSourceName(char* p_output, const char* p_input) +{ + const char* cln = strchr(p_input, ':'); + if (cln) { + p_input = cln + 1; + } + + strcpy(p_output, p_input); + + strlwr(p_output); + + char* extLoc = strstr(p_output, ".si"); + if (extLoc) { + *extLoc = 0; + } +} + +// FUNCTION: LEGO1 0x100b7050 +MxBool KeyValueStringParse(char* p_outputValue, const char* p_key, const char* p_source) +{ + MxBool didMatch = FALSE; + + MxS16 len = strlen(p_source); + char* temp = new char[len + 1]; + strcpy(temp, p_source); + + char* token = strtok(temp, ", \t\r\n:"); + while (token) { + len -= (strlen(token) + 1); + + if (strcmpi(token, p_key) == 0) { + if (p_outputValue && len > 0) { + char* cur = &token[strlen(p_key)]; + cur++; + while (*cur != ',') { + if (*cur == ' ' || *cur == '\0' || *cur == '\t' || *cur == '\n' || *cur == '\r') + break; + *p_outputValue++ = *cur++; + } + *p_outputValue = '\0'; + } + + didMatch = TRUE; + break; + } + + token = strtok(NULL, ", \t\r\n:"); + } + + delete[] temp; + return didMatch; +} + +// FUNCTION: LEGO1 0x100b7210 +void SetOmniUserMessage(void (*p_userMsg)(const char*, int)) +{ + g_omniUserMessage = p_userMsg; +} + +// Should probably be somewhere else +// FUNCTION: LEGO1 0x100c0280 +MxDSObject* CreateStreamObject(MxDSFile* p_file, MxS16 p_ofs) +{ + MxU8* buf; + _MMCKINFO tmpChunk; + + if (p_file->Seek(((MxLong*) p_file->GetBuffer())[p_ofs], 0)) { + return NULL; + } + + if (p_file->Read((MxU8*) &tmpChunk.ckid, 8) == 0 && tmpChunk.ckid == FOURCC('M', 'x', 'S', 't')) { + if (p_file->Read((MxU8*) &tmpChunk.ckid, 8) == 0 && tmpChunk.ckid == FOURCC('M', 'x', 'O', 'b')) { + + buf = new MxU8[tmpChunk.cksize]; + if (!buf) { + return NULL; + } + + if (p_file->Read(buf, tmpChunk.cksize) != 0) { + return NULL; + } + + // Save a copy so we can clean up properly, because + // this function will alter the pointer value. + MxU8* copy = buf; + MxDSObject* obj = DeserializeDSObjectDispatch(&buf, -1); + delete[] copy; + return obj; + } + return NULL; + } + + return NULL; +} diff --git a/LEGO1/omni/src/control/mxcontrolpresenter.cpp b/LEGO1/omni/src/control/mxcontrolpresenter.cpp index 47e8a720..2c7fb81d 100644 --- a/LEGO1/omni/src/control/mxcontrolpresenter.cpp +++ b/LEGO1/omni/src/control/mxcontrolpresenter.cpp @@ -1,6 +1,5 @@ #include "mxcontrolpresenter.h" -#include "legoomni.h" #include "mxticklemanager.h" DECOMP_SIZE_ASSERT(MxControlPresenter, 0x5c) diff --git a/LEGO1/omni/src/notify/mxnotificationmanager.cpp b/LEGO1/omni/src/notify/mxnotificationmanager.cpp index cc9f3930..37eab387 100644 --- a/LEGO1/omni/src/notify/mxnotificationmanager.cpp +++ b/LEGO1/omni/src/notify/mxnotificationmanager.cpp @@ -2,8 +2,8 @@ #include "compat.h" #include "decomp.h" -#include "legoomni.h" #include "mxautolocker.h" +#include "mxomni.h" #include "mxparam.h" #include "mxticklemanager.h" #include "mxtypes.h" diff --git a/LEGO1/omni/src/stream/mxstreamchunk.cpp b/LEGO1/omni/src/stream/mxstreamchunk.cpp index 57945957..4dceabec 100644 --- a/LEGO1/omni/src/stream/mxstreamchunk.cpp +++ b/LEGO1/omni/src/stream/mxstreamchunk.cpp @@ -1,8 +1,8 @@ #include "mxstreamchunk.h" -#include "legoutil.h" #include "mxdsbuffer.h" #include "mxstreamlist.h" +#include "mxutil.h" // FUNCTION: LEGO1 0x100c2fe0 MxStreamChunk::~MxStreamChunk() diff --git a/LEGO1/omni/src/stream/mxstreamcontroller.cpp b/LEGO1/omni/src/stream/mxstreamcontroller.cpp index 4e054b98..caacbb5f 100644 --- a/LEGO1/omni/src/stream/mxstreamcontroller.cpp +++ b/LEGO1/omni/src/stream/mxstreamcontroller.cpp @@ -1,14 +1,14 @@ #include "mxstreamcontroller.h" -#include "legoomni.h" -#include "legoutil.h" #include "mxautolocker.h" #include "mxdsmultiaction.h" #include "mxdsstreamingaction.h" #include "mxnextactiondatastart.h" +#include "mxomni.h" #include "mxstl/stlcompat.h" #include "mxstreamchunk.h" #include "mxtimer.h" +#include "mxutil.h" DECOMP_SIZE_ASSERT(MxStreamController, 0x64) DECOMP_SIZE_ASSERT(MxNextActionDataStart, 0x14) diff --git a/LEGO1/omni/src/stream/mxstreamer.cpp b/LEGO1/omni/src/stream/mxstreamer.cpp index 49fb31c3..245a757f 100644 --- a/LEGO1/omni/src/stream/mxstreamer.cpp +++ b/LEGO1/omni/src/stream/mxstreamer.cpp @@ -1,8 +1,8 @@ #include "mxstreamer.h" -#include "legoomni.h" #include "mxdiskstreamcontroller.h" #include "mxnotificationmanager.h" +#include "mxomni.h" #include "mxramstreamcontroller.h" #include diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp index 69d28822..e05b0816 100644 --- a/LEGO1/omni/src/video/mxdisplaysurface.cpp +++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp @@ -1,6 +1,6 @@ #include "mxdisplaysurface.h" -#include "legoomni.h" +#include "mxutil.h" #include "mxvideomanager.h" #include diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp index ee659827..8e81f498 100644 --- a/LEGO1/omni/src/video/mxstillpresenter.cpp +++ b/LEGO1/omni/src/video/mxstillpresenter.cpp @@ -2,10 +2,10 @@ #include "decomp.h" #include "define.h" -#include "legoomni.h" #include "mxcompositepresenter.h" #include "mxdsmediaaction.h" #include "mxomni.h" +#include "mxutil.h" #include "mxvideomanager.h" DECOMP_SIZE_ASSERT(MxStillPresenter, 0x6c); diff --git a/LEGO1/omni/src/video/mxvideomanager.cpp b/LEGO1/omni/src/video/mxvideomanager.cpp index 5ce00bab..f58ff13f 100644 --- a/LEGO1/omni/src/video/mxvideomanager.cpp +++ b/LEGO1/omni/src/video/mxvideomanager.cpp @@ -1,6 +1,5 @@ #include "mxvideomanager.h" -#include "legoomni.h" #include "mxautolocker.h" #include "mxpresenter.h" #include "mxticklemanager.h" From 569d8ace96cd75a163bffd1bfcc0cbfddb1dcaa8 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sun, 7 Jan 2024 20:55:32 -0500 Subject: [PATCH 3/9] Fix actions not ending --- LEGO1/omni/src/common/mxmediapresenter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LEGO1/omni/src/common/mxmediapresenter.cpp b/LEGO1/omni/src/common/mxmediapresenter.cpp index eb05a9d4..874734e3 100644 --- a/LEGO1/omni/src/common/mxmediapresenter.cpp +++ b/LEGO1/omni/src/common/mxmediapresenter.cpp @@ -226,7 +226,7 @@ void MxMediaPresenter::RepeatingTickle() } } else { - if (m_action->GetElapsedTime() <= m_action->GetStartTime() + m_action->GetDuration()) { + if (m_action->GetStartTime() + m_action->GetDuration() <= m_action->GetElapsedTime()) { m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState; m_currentTickleState = TickleState_unk5; } From 855e548516587acc308e20c13cb584233a666a3a Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sun, 7 Jan 2024 21:23:09 -0500 Subject: [PATCH 4/9] Make comparison more obvious --- LEGO1/omni/src/common/mxmediapresenter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LEGO1/omni/src/common/mxmediapresenter.cpp b/LEGO1/omni/src/common/mxmediapresenter.cpp index 874734e3..66b98f5c 100644 --- a/LEGO1/omni/src/common/mxmediapresenter.cpp +++ b/LEGO1/omni/src/common/mxmediapresenter.cpp @@ -226,7 +226,7 @@ void MxMediaPresenter::RepeatingTickle() } } else { - if (m_action->GetStartTime() + m_action->GetDuration() <= m_action->GetElapsedTime()) { + if (m_action->GetElapsedTime() >= m_action->GetStartTime() + m_action->GetDuration()) { m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState; m_currentTickleState = TickleState_unk5; } From 79465d358d6bb41c96832f265151477baf7a47f7 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sun, 7 Jan 2024 22:28:16 -0500 Subject: [PATCH 5/9] Fix MxWavePresenter::StartingTickle --- LEGO1/omni/src/audio/mxwavepresenter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LEGO1/omni/src/audio/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp index 9c141781..a2102ae8 100644 --- a/LEGO1/omni/src/audio/mxwavepresenter.cpp +++ b/LEGO1/omni/src/audio/mxwavepresenter.cpp @@ -144,7 +144,7 @@ void MxWavePresenter::ReadyTickle() // FUNCTION: LEGO1 0x100b1d50 void MxWavePresenter::StartingTickle() { - MxStreamChunk* chunk = NextChunk(); + MxStreamChunk* chunk = FUN_100b5650(); if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) { MxU32 length = chunk->GetLength(); From 58ea45f4cc72e8f71b19b9817c0b40d83c4412ed Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Mon, 8 Jan 2024 13:07:13 -0500 Subject: [PATCH 6/9] Name various functions and other members (#418) * Name various functions and other members * Rename var --- .../legoomni/include/legopalettepresenter.h | 2 +- .../src/common/legoactioncontrolpresenter.cpp | 2 +- .../src/common/mxcompositemediapresenter.cpp | 2 +- .../src/video/legopalettepresenter.cpp | 10 +-- LEGO1/omni/include/mxdssubscriber.h | 20 +++--- LEGO1/omni/include/mxmediapresenter.h | 12 ++-- LEGO1/omni/include/mxwavepresenter.h | 30 ++++---- LEGO1/omni/src/audio/mxmidipresenter.cpp | 6 +- LEGO1/omni/src/audio/mxwavepresenter.cpp | 12 ++-- LEGO1/omni/src/common/mxmediapresenter.cpp | 72 +++++++++---------- LEGO1/omni/src/event/mxeventpresenter.cpp | 4 +- LEGO1/omni/src/stream/mxdssubscriber.cpp | 60 ++++++++-------- .../omni/src/video/mxloopingflcpresenter.cpp | 4 +- .../omni/src/video/mxloopingsmkpresenter.cpp | 16 ++--- LEGO1/omni/src/video/mxstillpresenter.cpp | 4 +- LEGO1/omni/src/video/mxvideopresenter.cpp | 10 +-- 16 files changed, 133 insertions(+), 133 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legopalettepresenter.h b/LEGO1/lego/legoomni/include/legopalettepresenter.h index f725149d..858e1097 100644 --- a/LEGO1/lego/legoomni/include/legopalettepresenter.h +++ b/LEGO1/lego/legoomni/include/legopalettepresenter.h @@ -28,7 +28,7 @@ class LegoPalettePresenter : public MxVideoPresenter { virtual void ReadyTickle() override; // vtable+0x18 virtual void Destroy() override; // vtable+0x38 - MxResult ParsePallete(MxStreamChunk* p_chunk); + MxResult ParsePalette(MxStreamChunk* p_chunk); private: void Init(); diff --git a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp index 5f4867ea..953aef36 100644 --- a/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp +++ b/LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp @@ -22,7 +22,7 @@ void LegoActionControlPresenter::ReadyTickle() m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState; m_currentTickleState = TickleState_Starting; - m_subscriber->FUN_100b8390(chunk); + m_subscriber->DestroyChunk(chunk); if (m_compositePresenter) { if (m_action->GetDuration() == -1 || m_action->GetFlags() & 1) { m_compositePresenter->VTable0x60(this); diff --git a/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp index 0547c815..2a15d445 100644 --- a/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp +++ b/LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp @@ -114,7 +114,7 @@ void MxCompositeMediaPresenter::StartingTickle() } else { for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) { - if (!(*it)->GetAction()->GetStartTime() && ((MxMediaPresenter*) *it)->FUN_100b5650() && + if (!(*it)->GetAction()->GetStartTime() && ((MxMediaPresenter*) *it)->CurrentChunk() && !((*it)->GetAction()->GetFlags() & MxDSAction::Flag_Bit9)) { (*it)->Tickle(); (*it)->GetAction()->SetFlags((*it)->GetAction()->GetFlags() | MxDSAction::Flag_Bit9); diff --git a/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp b/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp index f18a22c3..821942b9 100644 --- a/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legopalettepresenter.cpp @@ -46,7 +46,7 @@ void LegoPalettePresenter::Destroy() } // FUNCTION: LEGO1 0x1007a130 -MxResult LegoPalettePresenter::ParsePallete(MxStreamChunk* p_chunk) +MxResult LegoPalettePresenter::ParsePalette(MxStreamChunk* p_chunk) { MxU8 buffer[40]; RGBQUAD palleteData[256]; @@ -72,15 +72,15 @@ MxResult LegoPalettePresenter::ParsePallete(MxStreamChunk* p_chunk) // FUNCTION: LEGO1 0x1007a230 void LegoPalettePresenter::ReadyTickle() { - MxStreamChunk* chunk = m_subscriber->FUN_100b8360(); + MxStreamChunk* chunk = m_subscriber->CurrentChunk(); if (chunk) { if (chunk->GetTime() <= m_action->GetElapsedTime()) { ParseExtra(); m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState; m_currentTickleState = TickleState_Starting; - chunk = m_subscriber->FUN_100b8250(); - MxResult result = ParsePallete(chunk); - m_subscriber->FUN_100b8390(chunk); + chunk = m_subscriber->NextChunk(); + MxResult result = ParsePalette(chunk); + m_subscriber->DestroyChunk(chunk); if (result == SUCCESS) { VideoManager()->RealizePalette(m_palette); diff --git a/LEGO1/omni/include/mxdssubscriber.h b/LEGO1/omni/include/mxdssubscriber.h index 8187e354..1156be36 100644 --- a/LEGO1/omni/include/mxdssubscriber.h +++ b/LEGO1/omni/include/mxdssubscriber.h @@ -32,21 +32,21 @@ class MxDSSubscriber : public MxCore { MxResult Create(MxStreamController* p_controller, MxU32 p_objectId, MxS16 p_unk0x48); void DeleteChunks(); MxResult AddChunk(MxStreamChunk* p_chunk, MxBool p_append); - MxStreamChunk* FUN_100b8250(); - MxStreamChunk* FUN_100b8360(); - void FUN_100b8390(MxStreamChunk* p_chunk); + MxStreamChunk* NextChunk(); + MxStreamChunk* CurrentChunk(); + void DestroyChunk(MxStreamChunk* p_chunk); inline MxU32 GetObjectId() { return m_objectId; } inline MxS16 GetUnknown48() { return m_unk0x48; } private: - MxStreamChunkList m_unk0x08; // 0x08 - MxStreamChunkListCursor* m_unk0x20; // 0x20 - MxStreamChunkList m_unk0x24; // 0x24 - MxStreamChunkListCursor* m_unk0x3c; // 0x3c - MxStreamController* m_controller; // 0x40 - MxU32 m_objectId; // 0x44 - MxS16 m_unk0x48; // 0x48 + MxStreamChunkList m_pendingChunks; // 0x08 + MxStreamChunkListCursor* m_pendingChunkCursor; // 0x20 + MxStreamChunkList m_consumedChunks; // 0x24 + MxStreamChunkListCursor* m_consumedChunkCursor; // 0x3c + MxStreamController* m_controller; // 0x40 + MxU32 m_objectId; // 0x44 + MxS16 m_unk0x48; // 0x48 }; // SYNTHETIC: LEGO1 0x100b7de0 diff --git a/LEGO1/omni/include/mxmediapresenter.h b/LEGO1/omni/include/mxmediapresenter.h index 32c7b6d0..64baa409 100644 --- a/LEGO1/omni/include/mxmediapresenter.h +++ b/LEGO1/omni/include/mxmediapresenter.h @@ -35,19 +35,19 @@ class MxMediaPresenter : public MxPresenter { virtual MxResult StartAction(MxStreamController*, MxDSAction*) override; // vtable+0x3c virtual void EndAction() override; // vtable+0x40 virtual void Enable(MxBool p_enable) override; // vtable+0x54 - virtual void AppendChunk(MxStreamChunk* p_chunk); // vtable+0x58 + virtual void LoopChunk(MxStreamChunk* p_chunk); // vtable+0x58 protected: - MxDSSubscriber* m_subscriber; // 0x40 - MxStreamChunkList* m_chunks; // 0x44 - MxStreamChunkListCursor* m_cursor; // 0x48 - MxStreamChunk* m_currentChunk; // 0x4c + MxDSSubscriber* m_subscriber; // 0x40 + MxStreamChunkList* m_loopingChunks; // 0x44 + MxStreamChunkListCursor* m_loopingChunkCursor; // 0x48 + MxStreamChunk* m_currentChunk; // 0x4c void Init(); void Destroy(MxBool p_fromDestructor); public: - MxStreamChunk* FUN_100b5650(); + MxStreamChunk* CurrentChunk(); MxStreamChunk* NextChunk(); }; diff --git a/LEGO1/omni/include/mxwavepresenter.h b/LEGO1/omni/include/mxwavepresenter.h index cd09d486..383659ab 100644 --- a/LEGO1/omni/include/mxwavepresenter.h +++ b/LEGO1/omni/include/mxwavepresenter.h @@ -26,21 +26,21 @@ class MxWavePresenter : public MxSoundPresenter { return !strcmp(p_name, MxWavePresenter::ClassName()) || MxSoundPresenter::IsA(p_name); } - virtual void ReadyTickle() override; // vtable+0x18 - virtual void StartingTickle() override; // vtable+0x1c - virtual void StreamingTickle() override; // vtable+0x20 - virtual void DoneTickle() override; // vtable+0x2c - virtual void ParseExtra() override; // vtable+0x30 - virtual MxResult AddToManager() override; // vtable+0x34 - virtual void Destroy() override; // vtable+0x38 - virtual void EndAction() override; // vtable+0x40 - virtual MxResult PutData() override; // vtable+0x4c - virtual void Enable(MxBool p_enable) override; // vtable+0x54 - virtual void AppendChunk(MxStreamChunk* p_chunk) override; // vtable+0x58 - virtual void SetVolume(MxS32 p_volume) override; // vtable+0x60 - virtual void Pause(); // vtable+0x64 - virtual void Resume(); // vtable+0x68 - virtual MxBool IsPaused(); // vtable+0x6c + virtual void ReadyTickle() override; // vtable+0x18 + virtual void StartingTickle() override; // vtable+0x1c + virtual void StreamingTickle() override; // vtable+0x20 + virtual void DoneTickle() override; // vtable+0x2c + virtual void ParseExtra() override; // vtable+0x30 + virtual MxResult AddToManager() override; // vtable+0x34 + virtual void Destroy() override; // vtable+0x38 + virtual void EndAction() override; // vtable+0x40 + virtual MxResult PutData() override; // vtable+0x4c + virtual void Enable(MxBool p_enable) override; // vtable+0x54 + virtual void LoopChunk(MxStreamChunk* p_chunk) override; // vtable+0x58 + virtual void SetVolume(MxS32 p_volume) override; // vtable+0x60 + virtual void Pause(); // vtable+0x64 + virtual void Resume(); // vtable+0x68 + virtual MxBool IsPaused(); // vtable+0x6c // Reference: https://github.com/itsmattkc/SIEdit/blob/master/lib/othertypes.h // SIZE 0x1c diff --git a/LEGO1/omni/src/audio/mxmidipresenter.cpp b/LEGO1/omni/src/audio/mxmidipresenter.cpp index ebf6ab68..95add150 100644 --- a/LEGO1/omni/src/audio/mxmidipresenter.cpp +++ b/LEGO1/omni/src/audio/mxmidipresenter.cpp @@ -35,7 +35,7 @@ void MxMIDIPresenter::Destroy(MxBool p_fromDestructor) m_criticalSection.Enter(); if (m_subscriber && m_chunk) - m_subscriber->FUN_100b8390(m_chunk); + m_subscriber->DestroyChunk(m_chunk); Init(); m_criticalSection.Leave(); @@ -50,7 +50,7 @@ void MxMIDIPresenter::ReadyTickle() MxStreamChunk* chunk = NextChunk(); if (chunk) { - m_subscriber->FUN_100b8390(chunk); + m_subscriber->DestroyChunk(chunk); ParseExtra(); m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState; m_currentTickleState = TickleState_Starting; @@ -60,7 +60,7 @@ void MxMIDIPresenter::ReadyTickle() // FUNCTION: LEGO1 0x100c28d0 void MxMIDIPresenter::StartingTickle() { - MxStreamChunk* chunk = FUN_100b5650(); + MxStreamChunk* chunk = CurrentChunk(); if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) { m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState; diff --git a/LEGO1/omni/src/audio/mxwavepresenter.cpp b/LEGO1/omni/src/audio/mxwavepresenter.cpp index a2102ae8..d77ccac2 100644 --- a/LEGO1/omni/src/audio/mxwavepresenter.cpp +++ b/LEGO1/omni/src/audio/mxwavepresenter.cpp @@ -134,7 +134,7 @@ void MxWavePresenter::ReadyTickle() if (chunk) { m_waveFormat = (WaveFormat*) new MxU8[chunk->GetLength()]; memcpy(m_waveFormat, chunk->GetData(), chunk->GetLength()); - m_subscriber->FUN_100b8390(chunk); + m_subscriber->DestroyChunk(chunk); ParseExtra(); m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState; m_currentTickleState = TickleState_Starting; @@ -144,7 +144,7 @@ void MxWavePresenter::ReadyTickle() // FUNCTION: LEGO1 0x100b1d50 void MxWavePresenter::StartingTickle() { - MxStreamChunk* chunk = FUN_100b5650(); + MxStreamChunk* chunk = CurrentChunk(); if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) { MxU32 length = chunk->GetLength(); @@ -199,7 +199,7 @@ void MxWavePresenter::StreamingTickle() { if (!m_currentChunk) { if (!(m_action->GetFlags() & MxDSAction::Flag_Looping)) { - MxStreamChunk* chunk = FUN_100b5650(); + MxStreamChunk* chunk = CurrentChunk(); if (chunk && chunk->GetFlags() & MxDSChunk::Flag_End && !(chunk->GetFlags() & MxDSChunk::Flag_Bit16)) { chunk->SetFlags(chunk->GetFlags() | MxDSChunk::Flag_Bit16); @@ -237,11 +237,11 @@ void MxWavePresenter::DoneTickle() } // FUNCTION: LEGO1 0x100b2130 -void MxWavePresenter::AppendChunk(MxStreamChunk* p_chunk) +void MxWavePresenter::LoopChunk(MxStreamChunk* p_chunk) { WriteToSoundBuffer(p_chunk->GetData(), p_chunk->GetLength()); if (IsEnabled()) - m_subscriber->FUN_100b8390(p_chunk); + m_subscriber->DestroyChunk(p_chunk); } // FUNCTION: LEGO1 0x100b2160 @@ -254,7 +254,7 @@ MxResult MxWavePresenter::PutData() case TickleState_Streaming: if (m_currentChunk && FUN_100b1ba0()) { WriteToSoundBuffer(m_currentChunk->GetData(), m_currentChunk->GetLength()); - m_subscriber->FUN_100b8390(m_currentChunk); + m_subscriber->DestroyChunk(m_currentChunk); m_currentChunk = NULL; } diff --git a/LEGO1/omni/src/common/mxmediapresenter.cpp b/LEGO1/omni/src/common/mxmediapresenter.cpp index 66b98f5c..a9383e4d 100644 --- a/LEGO1/omni/src/common/mxmediapresenter.cpp +++ b/LEGO1/omni/src/common/mxmediapresenter.cpp @@ -27,8 +27,8 @@ void MxMediaPresenter::Destroy() void MxMediaPresenter::Init() { this->m_subscriber = NULL; - this->m_chunks = NULL; - this->m_cursor = NULL; + this->m_loopingChunks = NULL; + this->m_loopingChunkCursor = NULL; this->m_currentChunk = NULL; } @@ -39,22 +39,22 @@ void MxMediaPresenter::Destroy(MxBool p_fromDestructor) MxAutoLocker lock(&m_criticalSection); if (m_currentChunk && m_subscriber) - m_subscriber->FUN_100b8390(m_currentChunk); + m_subscriber->DestroyChunk(m_currentChunk); if (m_subscriber) delete m_subscriber; - if (m_cursor) - delete m_cursor; + if (m_loopingChunkCursor) + delete m_loopingChunkCursor; - if (m_chunks) { - MxStreamChunkListCursor cursor(m_chunks); + if (m_loopingChunks) { + MxStreamChunkListCursor cursor(m_loopingChunks); MxStreamChunk* chunk; while (cursor.Next(chunk)) chunk->Release(); - delete m_chunks; + delete m_loopingChunks; } Init(); @@ -65,44 +65,44 @@ void MxMediaPresenter::Destroy(MxBool p_fromDestructor) } // FUNCTION: LEGO1 0x100b5650 -MxStreamChunk* MxMediaPresenter::FUN_100b5650() +MxStreamChunk* MxMediaPresenter::CurrentChunk() { - MxStreamChunk* result = NULL; + MxStreamChunk* chunk = NULL; if (m_subscriber) { - result = m_subscriber->FUN_100b8360(); + chunk = m_subscriber->CurrentChunk(); - if (result && result->GetFlags() & MxDSChunk::Flag_Bit3) { + if (chunk && chunk->GetFlags() & MxDSChunk::Flag_Bit3) { m_action->SetFlags(m_action->GetFlags() | MxDSAction::Flag_Bit7); - m_subscriber->FUN_100b8250(); - m_subscriber->FUN_100b8390(result); - result = NULL; + m_subscriber->NextChunk(); + m_subscriber->DestroyChunk(chunk); + chunk = NULL; m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState; m_currentTickleState = TickleState_Done; } } - return result; + return chunk; } // FUNCTION: LEGO1 0x100b56b0 MxStreamChunk* MxMediaPresenter::NextChunk() { - MxStreamChunk* result = NULL; + MxStreamChunk* chunk = NULL; if (m_subscriber) { - result = m_subscriber->FUN_100b8250(); + chunk = m_subscriber->NextChunk(); - if (result && result->GetFlags() & MxDSChunk::Flag_Bit3) { + if (chunk && chunk->GetFlags() & MxDSChunk::Flag_Bit3) { m_action->SetFlags(m_action->GetFlags() | MxDSAction::Flag_Bit7); - m_subscriber->FUN_100b8390(result); - result = NULL; + m_subscriber->DestroyChunk(chunk); + chunk = NULL; m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState; m_currentTickleState = TickleState_Done; } } - return result; + return chunk; } // FUNCTION: LEGO1 0x100b5700 @@ -113,10 +113,10 @@ MxResult MxMediaPresenter::StartAction(MxStreamController* p_controller, MxDSAct if (MxPresenter::StartAction(p_controller, p_action) == SUCCESS) { if (m_action->GetFlags() & MxDSAction::Flag_Looping) { - m_chunks = new MxStreamChunkList; - m_cursor = new MxStreamChunkListCursor(m_chunks); + m_loopingChunks = new MxStreamChunkList; + m_loopingChunkCursor = new MxStreamChunkListCursor(m_loopingChunks); - if (!m_chunks && !m_cursor) + if (!m_loopingChunks && !m_loopingChunkCursor) goto done; } @@ -180,7 +180,7 @@ MxResult MxMediaPresenter::Tickle() { MxAutoLocker lock(&m_criticalSection); - FUN_100b5650(); + CurrentChunk(); return MxPresenter::Tickle(); } @@ -193,16 +193,16 @@ void MxMediaPresenter::StreamingTickle() if (m_currentChunk) { if (m_currentChunk->GetFlags() & MxDSChunk::Flag_End) { - m_subscriber->FUN_100b8390(m_currentChunk); + m_subscriber->DestroyChunk(m_currentChunk); m_currentChunk = NULL; m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState; m_currentTickleState = TickleState_Repeating; } else if (m_action->GetFlags() & MxDSAction::Flag_Looping) { - AppendChunk(m_currentChunk); + LoopChunk(m_currentChunk); if (!IsEnabled()) { - m_subscriber->FUN_100b8390(m_currentChunk); + m_subscriber->DestroyChunk(m_currentChunk); m_currentChunk = NULL; } } @@ -214,9 +214,9 @@ void MxMediaPresenter::StreamingTickle() void MxMediaPresenter::RepeatingTickle() { if (IsEnabled() && !m_currentChunk) { - if (m_cursor) - if (!m_cursor->Next(m_currentChunk)) - m_cursor->Next(m_currentChunk); + if (m_loopingChunkCursor) + if (!m_loopingChunkCursor->Next(m_currentChunk)) + m_loopingChunkCursor->Next(m_currentChunk); if (m_currentChunk) { MxLong time = m_currentChunk->GetTime(); @@ -243,7 +243,7 @@ void MxMediaPresenter::DoneTickle() } // FUNCTION: LEGO1 0x100b5f10 -void MxMediaPresenter::AppendChunk(MxStreamChunk* p_chunk) +void MxMediaPresenter::LoopChunk(MxStreamChunk* p_chunk) { MxStreamChunk* chunk = new MxStreamChunk; @@ -253,7 +253,7 @@ void MxMediaPresenter::AppendChunk(MxStreamChunk* p_chunk) chunk->SetTime(p_chunk->GetTime()); memcpy(chunk->GetData(), p_chunk->GetData(), chunk->GetLength()); - m_chunks->Append(chunk); + m_loopingChunks->Append(chunk); } // FUNCTION: LEGO1 0x100b6030 @@ -268,8 +268,8 @@ void MxMediaPresenter::Enable(MxBool p_enable) SetTickleState(TickleState_Repeating); } else { - if (m_cursor) - m_cursor->Reset(); + if (m_loopingChunkCursor) + m_loopingChunkCursor->Reset(); m_currentChunk = NULL; SetTickleState(TickleState_Done); } diff --git a/LEGO1/omni/src/event/mxeventpresenter.cpp b/LEGO1/omni/src/event/mxeventpresenter.cpp index ce3fdbdf..6a0a0cbd 100644 --- a/LEGO1/omni/src/event/mxeventpresenter.cpp +++ b/LEGO1/omni/src/event/mxeventpresenter.cpp @@ -69,7 +69,7 @@ void MxEventPresenter::ReadyTickle() if (chunk) { CopyData(chunk); - m_subscriber->FUN_100b8390(chunk); + m_subscriber->DestroyChunk(chunk); ParseExtra(); m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState; m_currentTickleState = TickleState_Starting; @@ -107,7 +107,7 @@ MxResult MxEventPresenter::PutData() } if (m_currentTickleState == TickleState_Streaming) - m_subscriber->FUN_100b8390(m_currentChunk); + m_subscriber->DestroyChunk(m_currentChunk); m_currentChunk = NULL; } } diff --git a/LEGO1/omni/src/stream/mxdssubscriber.cpp b/LEGO1/omni/src/stream/mxdssubscriber.cpp index f50d34a1..f93969e1 100644 --- a/LEGO1/omni/src/stream/mxdssubscriber.cpp +++ b/LEGO1/omni/src/stream/mxdssubscriber.cpp @@ -9,8 +9,8 @@ MxDSSubscriber::MxDSSubscriber() { m_unk0x48 = -1; m_objectId = -1; - m_unk0x20 = NULL; - m_unk0x3c = NULL; + m_pendingChunkCursor = NULL; + m_consumedChunkCursor = NULL; } // FUNCTION: LEGO1 0x100b7e00 @@ -21,13 +21,13 @@ MxDSSubscriber::~MxDSSubscriber() DeleteChunks(); - if (m_unk0x20) - delete m_unk0x20; - m_unk0x20 = NULL; + if (m_pendingChunkCursor) + delete m_pendingChunkCursor; + m_pendingChunkCursor = NULL; - if (m_unk0x3c) - delete m_unk0x3c; - m_unk0x3c = NULL; + if (m_consumedChunkCursor) + delete m_consumedChunkCursor; + m_consumedChunkCursor = NULL; } // FUNCTION: LEGO1 0x100b7ed0 @@ -40,12 +40,12 @@ MxResult MxDSSubscriber::Create(MxStreamController* p_controller, MxU32 p_object return FAILURE; m_controller = p_controller; - m_unk0x20 = new MxStreamChunkListCursor(&m_unk0x08); - if (!m_unk0x20) + m_pendingChunkCursor = new MxStreamChunkListCursor(&m_pendingChunks); + if (!m_pendingChunkCursor) return FAILURE; - m_unk0x3c = new MxStreamChunkListCursor(&m_unk0x24); - if (!m_unk0x3c) + m_consumedChunkCursor = new MxStreamChunkListCursor(&m_consumedChunks); + if (!m_consumedChunkCursor) return FAILURE; m_controller->AddSubscriber(this); @@ -58,13 +58,13 @@ void MxDSSubscriber::DeleteChunks() if (m_controller) { MxStreamChunk* chunk = NULL; - while (m_unk0x20->First(chunk)) { - m_unk0x20->Detach(); + while (m_pendingChunkCursor->First(chunk)) { + m_pendingChunkCursor->Detach(); delete chunk; } - while (m_unk0x3c->First(chunk)) { - m_unk0x3c->Detach(); + while (m_consumedChunkCursor->First(chunk)) { + m_consumedChunkCursor->Detach(); delete chunk; } } @@ -73,49 +73,49 @@ void MxDSSubscriber::DeleteChunks() // FUNCTION: LEGO1 0x100b8150 MxResult MxDSSubscriber::AddChunk(MxStreamChunk* p_chunk, MxBool p_append) { - if (m_unk0x20) { + if (m_pendingChunkCursor) { if (p_append) - m_unk0x08.Append(p_chunk); + m_pendingChunks.Append(p_chunk); else - m_unk0x08.Prepend(p_chunk); + m_pendingChunks.Prepend(p_chunk); } return SUCCESS; } // FUNCTION: LEGO1 0x100b8250 -MxStreamChunk* MxDSSubscriber::FUN_100b8250() +MxStreamChunk* MxDSSubscriber::NextChunk() { MxStreamChunk* chunk = NULL; - if (m_unk0x20) - m_unk0x20->First(chunk); + if (m_pendingChunkCursor) + m_pendingChunkCursor->First(chunk); if (chunk) { - m_unk0x20->Detach(); - m_unk0x24.Append(chunk); + m_pendingChunkCursor->Detach(); + m_consumedChunks.Append(chunk); } return chunk; } // FUNCTION: LEGO1 0x100b8360 -MxStreamChunk* MxDSSubscriber::FUN_100b8360() +MxStreamChunk* MxDSSubscriber::CurrentChunk() { MxStreamChunk* chunk = NULL; - if (m_unk0x20) - m_unk0x20->First(chunk); + if (m_pendingChunkCursor) + m_pendingChunkCursor->First(chunk); return chunk; } // FUNCTION: LEGO1 0x100b8390 -void MxDSSubscriber::FUN_100b8390(MxStreamChunk* p_chunk) +void MxDSSubscriber::DestroyChunk(MxStreamChunk* p_chunk) { if (p_chunk) { - if (m_unk0x3c->Find(p_chunk)) { - m_unk0x3c->Detach(); + if (m_consumedChunkCursor->Find(p_chunk)) { + m_consumedChunkCursor->Detach(); if (p_chunk) delete p_chunk; } diff --git a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp index 152bd385..fdd991a9 100644 --- a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp +++ b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp @@ -46,9 +46,9 @@ void MxLoopingFlcPresenter::NextFrame() } else { LoadFrame(chunk); - AppendChunk(chunk); + LoopChunk(chunk); m_unk0x68 += m_flicHeader->speed; } - m_subscriber->FUN_100b8390(chunk); + m_subscriber->DestroyChunk(chunk); } diff --git a/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp index 8d0f4d00..efa758cd 100644 --- a/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp +++ b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp @@ -57,11 +57,11 @@ void MxLoopingSmkPresenter::NextFrame() } else { LoadFrame(chunk); - AppendChunk(chunk); + LoopChunk(chunk); m_elapsedDuration += 1000 / ((MxDSMediaAction*) m_action)->GetFramesPerSecond(); } - m_subscriber->FUN_100b8390(chunk); + m_subscriber->DestroyChunk(chunk); } // FUNCTION: LEGO1 0x100b4a90 @@ -73,7 +73,7 @@ void MxLoopingSmkPresenter::VTable0x8c() } else { MxStreamChunk* chunk; - m_cursor->Current(chunk); + m_loopingChunkCursor->Current(chunk); LoadFrame(chunk); m_elapsedDuration += 1000 / ((MxDSMediaAction*) m_action)->GetFramesPerSecond(); } @@ -83,9 +83,9 @@ void MxLoopingSmkPresenter::VTable0x8c() void MxLoopingSmkPresenter::RepeatingTickle() { for (MxS16 i = 0; i < m_unk0x5c; i++) { - if (!m_cursor->HasMatch()) { + if (!m_loopingChunkCursor->HasMatch()) { MxStreamChunk* chunk; - MxStreamChunkListCursor cursor(m_chunks); + MxStreamChunkListCursor cursor(m_loopingChunks); cursor.Last(chunk); MxLong time = chunk->GetTime(); @@ -99,18 +99,18 @@ void MxLoopingSmkPresenter::RepeatingTickle() while (cursor.Next(chunk)) chunk->SetTime(chunk->GetTime() + time); - m_cursor->Next(); + m_loopingChunkCursor->Next(); } MxStreamChunk* chunk; - m_cursor->Current(chunk); + m_loopingChunkCursor->Current(chunk); if (m_action->GetElapsedTime() < chunk->GetTime()) break; VTable0x8c(); - m_cursor->Next(chunk); + m_loopingChunkCursor->Next(chunk); if (m_currentTickleState != TickleState_Repeating) break; diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp index 8e81f498..20e6b3a2 100644 --- a/LEGO1/omni/src/video/mxstillpresenter.cpp +++ b/LEGO1/omni/src/video/mxstillpresenter.cpp @@ -63,7 +63,7 @@ void MxStillPresenter::NextFrame() { MxStreamChunk* chunk = NextChunk(); LoadFrame(chunk); - m_subscriber->FUN_100b8390(chunk); + m_subscriber->DestroyChunk(chunk); } // FUNCTION: LEGO1 0x100b9dd0 @@ -122,7 +122,7 @@ void MxStillPresenter::StartingTickle() // FUNCTION: LEGO1 0x100b9f90 void MxStillPresenter::StreamingTickle() { - MxStreamChunk* chunk = FUN_100b5650(); + MxStreamChunk* chunk = CurrentChunk(); if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) { m_chunkTime = chunk->GetTime(); diff --git a/LEGO1/omni/src/video/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp index 5d507409..23c12cfb 100644 --- a/LEGO1/omni/src/video/mxvideopresenter.cpp +++ b/LEGO1/omni/src/video/mxvideopresenter.cpp @@ -241,13 +241,13 @@ void MxVideoPresenter::NextFrame() MxStreamChunk* chunk = NextChunk(); if (chunk->GetFlags() & MxDSChunk::Flag_End) { - m_subscriber->FUN_100b8390(chunk); + m_subscriber->DestroyChunk(chunk); m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState; m_currentTickleState = TickleState_Repeating; } else { LoadFrame(chunk); - m_subscriber->FUN_100b8390(chunk); + m_subscriber->DestroyChunk(chunk); } } @@ -458,7 +458,7 @@ void MxVideoPresenter::ReadyTickle() if (chunk) { LoadHeader(chunk); - m_subscriber->FUN_100b8390(chunk); + m_subscriber->DestroyChunk(chunk); ParseExtra(); m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState; m_currentTickleState = TickleState_Starting; @@ -468,7 +468,7 @@ void MxVideoPresenter::ReadyTickle() // FUNCTION: LEGO1 0x100b2fa0 void MxVideoPresenter::StartingTickle() { - MxStreamChunk* chunk = FUN_100b5650(); + MxStreamChunk* chunk = CurrentChunk(); if (chunk && m_action->GetElapsedTime() >= chunk->GetTime()) { CreateBitmap(); @@ -502,7 +502,7 @@ void MxVideoPresenter::StreamingTickle() break; LoadFrame(m_currentChunk); - m_subscriber->FUN_100b8390(m_currentChunk); + m_subscriber->DestroyChunk(m_currentChunk); m_currentChunk = NULL; m_flags |= Flag_Bit1; From 58085df6b0248a0f1a3d0633789bc4acec04702c Mon Sep 17 00:00:00 2001 From: Misha <106913236+MishaProductions@users.noreply.github.com> Date: Tue, 9 Jan 2024 04:43:21 -0500 Subject: [PATCH 7/9] Implement most of LegoCameraController (#419) * Implement LegoCameraController subclasses * Update legopovcontroller.cpp * fixes * Update legocameracontroller.cpp * fix naming conventions * Update legopointofviewcontroller.h * Update legopointofviewcontroller.h * Fixes * Match LegoPointOfViewController::Create --------- Co-authored-by: Christian Semmler --- CMakeLists.txt | 5 +- .../legoomni/include/legocameracontroller.h | 19 ++- .../lego/legoomni/include/legoinputmanager.h | 1 + .../lego/legoomni/include/legonavcontroller.h | 2 + LEGO1/lego/legoomni/include/legonotify.h | 11 ++ LEGO1/lego/legoomni/include/legoomni.h | 3 +- .../include/legopointofviewcontroller.h | 94 ++++++++++++ LEGO1/lego/legoomni/src/build/helicopter.cpp | 4 +- .../src/common/legocameracontroller.cpp | 47 ------ .../src/entity/legocameracontroller.cpp | 107 ++++++++++++++ .../{common => entity}/legonavcontroller.cpp | 0 .../legoomni/src/entity/legopovcontroller.cpp | 134 ++++++++++++++++++ 12 files changed, 373 insertions(+), 54 deletions(-) create mode 100644 LEGO1/lego/legoomni/include/legonotify.h create mode 100644 LEGO1/lego/legoomni/include/legopointofviewcontroller.h delete mode 100644 LEGO1/lego/legoomni/src/common/legocameracontroller.cpp create mode 100644 LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp rename LEGO1/lego/legoomni/src/{common => entity}/legonavcontroller.cpp (100%) create mode 100644 LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index eb5f1c25..483ba9db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,10 +32,8 @@ add_library(lego1 SHARED LEGO1/lego/legoomni/src/common/gifmanager.cpp LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp LEGO1/lego/legoomni/src/common/legobackgroundcolor.cpp - LEGO1/lego/legoomni/src/common/legocameracontroller.cpp LEGO1/lego/legoomni/src/common/legofullscreenmovie.cpp LEGO1/lego/legoomni/src/common/legogamestate.cpp - LEGO1/lego/legoomni/src/common/legonavcontroller.cpp LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp LEGO1/lego/legoomni/src/common/legoplantmanager.cpp LEGO1/lego/legoomni/src/common/legostate.cpp @@ -46,10 +44,13 @@ add_library(lego1 SHARED LEGO1/lego/legoomni/src/control/legocontrolmanager.cpp LEGO1/lego/legoomni/src/entity/legoactor.cpp LEGO1/lego/legoomni/src/entity/legoanimactor.cpp + LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp LEGO1/lego/legoomni/src/entity/legoentity.cpp LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp LEGO1/lego/legoomni/src/entity/legojetski.cpp + LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp LEGO1/lego/legoomni/src/entity/legopathactor.cpp + LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp LEGO1/lego/legoomni/src/entity/legorace.cpp LEGO1/lego/legoomni/src/entity/legoworld.cpp LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp diff --git a/LEGO1/lego/legoomni/include/legocameracontroller.h b/LEGO1/lego/legoomni/include/legocameracontroller.h index 09785df1..660ee5ae 100644 --- a/LEGO1/lego/legoomni/include/legocameracontroller.h +++ b/LEGO1/lego/legoomni/include/legocameracontroller.h @@ -1,17 +1,21 @@ #ifndef LEGOCAMERACONTROLLER_H #define LEGOCAMERACONTROLLER_H +#include "legopointofviewcontroller.h" #include "mxcore.h" +#include "mxpoint32.h" #include "realtime/matrix.h" #include "realtime/vector.h" // VTABLE: LEGO1 0x100d57b0 // SIZE 0xc8 -class LegoCameraController : public MxCore { +class LegoCameraController : public LegoPointOfViewController { public: LegoCameraController(); virtual ~LegoCameraController() override; // vtable+0x0 + virtual MxLong Notify(MxParam& p_param) override; // vtable+04 + // FUNCTION: LEGO1 0x10011ec0 inline virtual const char* ClassName() const override // vtable+0x0c { @@ -25,11 +29,22 @@ class LegoCameraController : public MxCore { return !strcmp(p_name, ClassName()) || MxCore::IsA(p_name); } - void LookAt(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3Impl& p_up); + virtual void OnLButtonDown(MxPoint32 p_point) override; // vtable+0x30 + virtual void OnLButtonUp(MxPoint32 p_point) override; // vtable+0x34 + virtual void OnRButtonDown(MxPoint32 p_point) override; // vtable+0x38 + virtual void OnRButtonUp(MxPoint32 p_point) override; // vtable+0x3c + virtual void OnMouseMove(MxU8 p_modifier, MxPoint32 p_point) override; // vtable+0x40 + virtual MxResult Create(); // vtable+0x44 + + void SetWorldTransform(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3Impl& p_up); void FUN_100123e0(Matrix4Data& p_transform, MxU32); Vector3Data& FUN_10012740(); Vector3Data& FUN_100127f0(); Vector3Data& FUN_100128a0(); + +private: + Matrix4Data m_matrix1; // 0x38 + Matrix4Data m_matrix2; // 0x80 }; #endif // LEGOCAMERACONTROLLER_H diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h index fcb9b560..961d8ffc 100644 --- a/LEGO1/lego/legoomni/include/legoinputmanager.h +++ b/LEGO1/lego/legoomni/include/legoinputmanager.h @@ -56,6 +56,7 @@ class LegoInputManager : public MxPresenter { inline LegoControlManager* GetControlManager() { return m_controlManager; } inline LegoWorld* GetWorld() { return m_world; } + inline LegoCameraController* GetCamera() { return m_camera; } void ProcessEvents(); MxBool ProcessOneEvent(LegoEventNotificationParam& p_param); diff --git a/LEGO1/lego/legoomni/include/legonavcontroller.h b/LEGO1/lego/legoomni/include/legonavcontroller.h index c6505341..97882566 100644 --- a/LEGO1/lego/legoomni/include/legonavcontroller.h +++ b/LEGO1/lego/legoomni/include/legonavcontroller.h @@ -59,6 +59,8 @@ class LegoNavController : public MxCore { float CalculateNewAccel(int p_pos, int p_center, float p_maxAccel, int p_minAccel); float CalculateNewVel(float p_targetVel, float p_currentVel, float p_accel, float p_time); + inline void SetTrackDefaultParams(MxBool p_trackDefault) { m_trackDefault = p_trackDefault; } + private: int m_hMax; int m_vMax; diff --git a/LEGO1/lego/legoomni/include/legonotify.h b/LEGO1/lego/legoomni/include/legonotify.h new file mode 100644 index 00000000..ed4218b2 --- /dev/null +++ b/LEGO1/lego/legoomni/include/legonotify.h @@ -0,0 +1,11 @@ +#ifndef LEGONOTIFY_H +#define LEGONOTIFY_H + +enum LegoEventNotificationParamType { + c_lButtonState = 1, + c_rButtonState = 2, + c_modKey1 = 4, + c_modKey2 = 8, +}; + +#endif // LEGONOTIFY_H diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h index 77cf47f5..fc9ba1c2 100644 --- a/LEGO1/lego/legoomni/include/legoomni.h +++ b/LEGO1/lego/legoomni/include/legoomni.h @@ -102,7 +102,6 @@ class LegoOmni : public MxOmni { LegoVideoManager* GetVideoManager() { return (LegoVideoManager*) m_videoManager; } LegoSoundManager* GetSoundManager() { return (LegoSoundManager*) m_soundManager; } - LegoInputManager* GetInputManager() { return m_inputMgr; } GifManager* GetGifManager() { return m_gifManager; } LegoWorld* GetCurrentOmniWorld() { return m_currentWorld; } @@ -116,6 +115,8 @@ class LegoOmni : public MxOmni { MxTransitionManager* GetTransitionManager() { return m_transitionManager; } MxDSAction& GetCurrentAction() { return m_action; } + inline void SetNavController(LegoNavController* p_navController) { m_navController = p_navController; } + inline void SetExit(MxBool p_exit) { m_exit = p_exit; }; private: diff --git a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h new file mode 100644 index 00000000..f0f8c3b1 --- /dev/null +++ b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h @@ -0,0 +1,94 @@ +#ifndef LEGOPOINTOFVIEWCONTROLLER_H +#define LEGOPOINTOFVIEWCONTROLLER_H + +#include "decomp.h" +#include "mxcore.h" + +#include + +class Lego3DView; +class LegoEntity; +class LegoNavController; + +////////////////////////////////////////////////////////////////////////////// +// +// LegoMouseController + +// VTABLE: LEGO1 0x100d8dd8 +// SIZE 0x20 +class LegoMouseController : public MxCore { +public: + LegoMouseController(); + virtual ~LegoMouseController() override; + + virtual void LeftDown(int, int); // vtable+0x14 + virtual void LeftDrag(int, int); // vtable+0x18 + virtual void LeftUp(int, int); // vtable+0x1c + virtual void RightDown(int, int); // vtable+0x20 + virtual void RightDrag(int, int); // vtable+0x24 + virtual void RightUp(int, int); // vtable+0x28 + +private: + BOOL m_isButtonDown; // 0x08 + undefined4 m_unk0xc; // 0x0c + MxDouble m_buttonX; // 0x10 + MxDouble m_buttonY; // 0x18 +}; + +// VTABLE: LEGO1 0x100d8e08 +// SIZE 0x38 +class LegoPointOfViewController : public LegoMouseController { +public: + LegoPointOfViewController(); + virtual ~LegoPointOfViewController() override; + + virtual MxResult Tickle() override; // vtable+0x08 + virtual void LeftDown(int p_x, int p_y) override; // vtable+0x0c + virtual void LeftDrag(int p_x, int p_y) override; // vtable+0x10 + + // FUNCTION: LEGO1 0x10011e40 + virtual void LeftUp(int p_x, int p_y) override + { + LegoMouseController::LeftUp(p_x, p_y); + AffectPointOfView(); + } + // vtable+0x14 + + // FUNCTION: LEGO1 0x10011e60 + virtual void RightDown(int p_x, int p_y) override + { + LegoMouseController::RightDown(p_x, p_y); + AffectPointOfView(); + } + // vtable+0x20 + + // FUNCTION: LEGO1 0x10011e80 + virtual void RightDrag(int p_x, int p_y) override + { + LegoMouseController::RightDrag(p_x, p_y); + AffectPointOfView(); + } + // vtable+0x24 + + // FUNCTION: LEGO1 0x10011ea0 + virtual void RightUp(int p_x, int p_y) override + { + LegoMouseController::RightUp(p_x, p_y); + AffectPointOfView(); + } // vtable+0x28 + virtual void SetEntity(LegoEntity* p_entity); // vtable+0x2c + + MxResult Create(Lego3DView* p_lego3DView); + + inline LegoEntity* GetEntity() { return m_entity; } + +protected: + void AffectPointOfView(); + + Lego3DView* m_lego3DView; // 0x20 + LegoEntity* m_entity; // 0x24 + MxDouble m_entityOffsetUp; // 0x28 + LegoNavController* m_nav; // 0x30 +}; + +#endif /* LEGOPOINTOFVIEWCONTROLLER_H */ diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp index 87ee1dcb..f4220183 100644 --- a/LEGO1/lego/legoomni/src/build/helicopter.cpp +++ b/LEGO1/lego/legoomni/src/build/helicopter.cpp @@ -238,7 +238,7 @@ MxU32 Helicopter::VTable0xd8(MxType18NotificationParam& p_param) mat.GetMatrix()[i][2] = mat2[i][2] * c + mat2[i][1] * s; } Vector3Impl at(mat.GetMatrix()[3]), dir(mat.GetMatrix()[2]), up(mat.GetMatrix()[1]); - m_world->GetCamera()->LookAt(at, dir, up); + m_world->GetCamera()->SetWorldTransform(at, dir, up); FUN_10010c30(); break; } @@ -247,7 +247,7 @@ MxU32 Helicopter::VTable0xd8(MxType18NotificationParam& p_param) mat.SetIdentity(); Vector3Impl at(mat.GetMatrix()[3]), dir(mat.GetMatrix()[2]), up(mat.GetMatrix()[1]); at[1] = 1.25; - m_world->GetCamera()->LookAt(at, dir, up); + m_world->GetCamera()->SetWorldTransform(at, dir, up); if (GameState()->GetUnknown10() == 0) { ((Act1State*) GameState()->GetState("Act1State"))->SetUnknown18(0); VTable0xe8(0x29, TRUE, 7); diff --git a/LEGO1/lego/legoomni/src/common/legocameracontroller.cpp b/LEGO1/lego/legoomni/src/common/legocameracontroller.cpp deleted file mode 100644 index ad1dbb67..00000000 --- a/LEGO1/lego/legoomni/src/common/legocameracontroller.cpp +++ /dev/null @@ -1,47 +0,0 @@ -#include "legocameracontroller.h" - -// STUB: LEGO1 0x10011d50 -LegoCameraController::LegoCameraController() -{ - // TODO -} - -// STUB: LEGO1 0x10011f70 -LegoCameraController::~LegoCameraController() -{ - // TODO -} - -// STUB: LEGO1 0x10012260 -void LegoCameraController::LookAt(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3Impl& p_up) -{ -} - -// STUB: LEGO1 0x100123e0 -void LegoCameraController::FUN_100123e0(Matrix4Data& p_transform, MxU32) -{ -} - -// STUB: LEGO1 0x10012740 -Vector3Data& LegoCameraController::FUN_10012740() -{ - // Actually returns reference to a member - static Vector3Data g_v; - return g_v; -} - -// STUB: LEGO1 0x100127f0 -Vector3Data& LegoCameraController::FUN_100127f0() -{ - // Actually returns reference to a member - static Vector3Data g_v; - return g_v; -} - -// STUB: LEGO1 0x100128a0 -Vector3Data& LegoCameraController::FUN_100128a0() -{ - // Actually returns reference to a member - static Vector3Data g_v; - return g_v; -} diff --git a/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp new file mode 100644 index 00000000..34afaac0 --- /dev/null +++ b/LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp @@ -0,0 +1,107 @@ +#include "legocameracontroller.h" + +#include "legoinputmanager.h" +#include "legonotify.h" +#include "legoomni.h" +#include "legovideomanager.h" + +DECOMP_SIZE_ASSERT(LegoCameraController, 0xc8); + +// FUNCTION: LEGO1 0x10011d50 +LegoCameraController::LegoCameraController() +{ + SetWorldTransform(Vector3Data(0, 0, 0), Vector3Data(0, 0, 1), Vector3Data(0, 1, 0)); +} + +// FUNCTION: LEGO1 0x10011f70 +LegoCameraController::~LegoCameraController() +{ + if (InputManager()) { + if (InputManager()->GetCamera() == this) { + InputManager()->ClearCamera(); + } + } +} + +// FUNCTION: LEGO1 0x10011ff0 +MxResult LegoCameraController::Create() +{ + InputManager()->SetCamera(this); + return LegoPointOfViewController::Create(VideoManager()->Get3DManager()->GetLego3DView()); +} + +// STUB: LEGO1 0x10012020 +MxLong LegoCameraController::Notify(MxParam& p_param) +{ + // TODO + return 0; +} + +// FUNCTION: LEGO1 0x100121b0 +void LegoCameraController::OnLButtonDown(MxPoint32 p_point) +{ + LeftDown(p_point.GetX(), p_point.GetY()); +} + +// FUNCTION: LEGO1 0x100121d0 +void LegoCameraController::OnLButtonUp(MxPoint32 p_point) +{ + LeftUp(p_point.GetX(), p_point.GetY()); +} + +// FUNCTION: LEGO1 0x100121f0 +void LegoCameraController::OnRButtonDown(MxPoint32 p_point) +{ + RightDown(p_point.GetX(), p_point.GetY()); +} + +// FUNCTION: LEGO1 0x10012210 +void LegoCameraController::OnRButtonUp(MxPoint32 p_point) +{ + RightUp(p_point.GetX(), p_point.GetY()); +} + +// FUNCTION: LEGO1 0x10012230 +void LegoCameraController::OnMouseMove(MxU8 p_modifier, MxPoint32 p_point) +{ + if (p_modifier & c_lButtonState) + LeftDrag(p_point.GetX(), p_point.GetY()); + else if (p_modifier & c_rButtonState) + RightDrag(p_point.GetX(), p_point.GetY()); +} + +// FUNCTION: LEGO1 0x10012260 +void LegoCameraController::SetWorldTransform(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3Impl& p_up) +{ + CalcLocalTransform(p_at, p_dir, p_up, m_matrix1); + m_matrix2 = m_matrix1; +} + +// STUB: LEGO1 0x100123e0 +void LegoCameraController::FUN_100123e0(Matrix4Data& p_transform, MxU32) +{ +} + +// STUB: LEGO1 0x10012740 +Vector3Data& LegoCameraController::FUN_10012740() +{ + // Actually returns reference to a member + static Vector3Data g_v; + return g_v; +} + +// STUB: LEGO1 0x100127f0 +Vector3Data& LegoCameraController::FUN_100127f0() +{ + // Actually returns reference to a member + static Vector3Data g_v; + return g_v; +} + +// STUB: LEGO1 0x100128a0 +Vector3Data& LegoCameraController::FUN_100128a0() +{ + // Actually returns reference to a member + static Vector3Data g_v; + return g_v; +} diff --git a/LEGO1/lego/legoomni/src/common/legonavcontroller.cpp b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp similarity index 100% rename from LEGO1/lego/legoomni/src/common/legonavcontroller.cpp rename to LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp diff --git a/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp b/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp new file mode 100644 index 00000000..a2e1bb04 --- /dev/null +++ b/LEGO1/lego/legoomni/src/entity/legopovcontroller.cpp @@ -0,0 +1,134 @@ +#include "legonavcontroller.h" +#include "legoomni.h" +#include "legopointofviewcontroller.h" +#include "mxticklemanager.h" + +DECOMP_SIZE_ASSERT(LegoMouseController, 0x20); +DECOMP_SIZE_ASSERT(LegoPointOfViewController, 0x38); + +////////////////////////////////////////////////////////////////////// + +// FUNCTION: LEGO1 0x10065550 +LegoMouseController::LegoMouseController() +{ + m_isButtonDown = FALSE; +} + +// FUNCTION: LEGO1 0x100655d0 +LegoMouseController::~LegoMouseController() +{ +} + +// FUNCTION: LEGO1 0x10065620 +void LegoMouseController::LeftDown(int p_x, int p_y) +{ + m_isButtonDown = TRUE; + m_buttonX = p_x; + m_buttonY = p_y; +} + +// FUNCTION: LEGO1 0x10065640 +void LegoMouseController::LeftUp(int p_x, int p_y) +{ + m_isButtonDown = FALSE; + m_buttonX = p_x; + m_buttonY = p_y; +} + +// FUNCTION: LEGO1 0x10065660 +void LegoMouseController::LeftDrag(int p_x, int p_y) +{ + m_buttonX = p_x; + m_buttonY = p_y; +} + +// FUNCTION: LEGO1 0x10065680 +void LegoMouseController::RightDown(int p_x, int p_y) +{ + m_isButtonDown = TRUE; + m_buttonX = p_x; + m_buttonY = p_y; +} + +// FUNCTION: LEGO1 0x100656a0 +void LegoMouseController::RightUp(int p_x, int p_y) +{ + m_isButtonDown = FALSE; + m_buttonX = p_x; + m_buttonY = p_y; +} + +// FUNCTION: LEGO1 0x100656c0 +void LegoMouseController::RightDrag(int p_x, int p_y) +{ + m_buttonX = p_x; + m_buttonY = p_y; +} + +////////////////////////////////////////////////////////////////////// + +// FUNCTION: LEGO1 0x100656e0 +LegoPointOfViewController::LegoPointOfViewController() +{ + m_lego3DView = NULL; + m_entity = NULL; + m_nav = NULL; + // m_entityOffsetUp is a temporary kludge. It should be replaced + // by 3D camera offset and position stored in the entity since each + // entity may have a different best viewpoint. + m_entityOffsetUp = 0.0; +} + +// FUNCTION: LEGO1 0x10065770 +LegoPointOfViewController::~LegoPointOfViewController() +{ + TickleManager()->UnregisterClient(this); + if (m_nav) { + delete m_nav; + m_nav = NULL; + } +} + +// FUNCTION: LEGO1 0x100657f0 +MxResult LegoPointOfViewController::Create(Lego3DView* p_lego3DView) +{ + m_lego3DView = p_lego3DView; + m_nav = new LegoNavController(); + LegoOmni::GetInstance()->SetNavController(m_nav); + m_nav->SetTrackDefaultParams(TRUE); + TickleManager()->RegisterClient(this, 10); + return SUCCESS; +} + +// FUNCTION: LEGO1 0x100658c0 +void LegoPointOfViewController::LeftDown(int p_x, int p_y) +{ + LegoMouseController::LeftDown(p_x, p_y); + AffectPointOfView(); +} + +// FUNCTION: LEGO1 0x100658e0 +void LegoPointOfViewController::LeftDrag(int p_x, int p_y) +{ + LegoMouseController::LeftDrag(p_x, p_y); + AffectPointOfView(); +} + +// STUB: LEGO1 0x10065900 +void LegoPointOfViewController::AffectPointOfView() +{ + // TODO +} + +// STUB: LEGO1 0x10065930 +MxResult LegoPointOfViewController::Tickle() +{ + // TODO + return SUCCESS; +} + +// STUB: LEGO1 0x10065ae0 +void LegoPointOfViewController::SetEntity(LegoEntity* p_entity) +{ + // TODO +} From f6ced08b20bc13dedb985e770b4b797f5a2393c6 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Tue, 9 Jan 2024 05:31:00 -0500 Subject: [PATCH 8/9] Add scalar ddtor annotations --- LEGO1/lego/legoomni/include/legocameracontroller.h | 3 +++ LEGO1/lego/legoomni/include/legopointofviewcontroller.h | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/LEGO1/lego/legoomni/include/legocameracontroller.h b/LEGO1/lego/legoomni/include/legocameracontroller.h index 660ee5ae..05c974a3 100644 --- a/LEGO1/lego/legoomni/include/legocameracontroller.h +++ b/LEGO1/lego/legoomni/include/legocameracontroller.h @@ -47,4 +47,7 @@ class LegoCameraController : public LegoPointOfViewController { Matrix4Data m_matrix2; // 0x80 }; +// SYNTHETIC: LEGO1 0x10011f50 +// LegoCameraController::`scalar deleting destructor' + #endif // LEGOCAMERACONTROLLER_H diff --git a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h index f0f8c3b1..a7e92e97 100644 --- a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h +++ b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h @@ -35,6 +35,9 @@ class LegoMouseController : public MxCore { MxDouble m_buttonY; // 0x18 }; +// SYNTHETIC: LEGO1 0x100655b0 +// LegoMouseController::`scalar deleting destructor' + // VTABLE: LEGO1 0x100d8e08 // SIZE 0x38 class LegoPointOfViewController : public LegoMouseController { @@ -91,4 +94,7 @@ class LegoPointOfViewController : public LegoMouseController { LegoNavController* m_nav; // 0x30 }; +// SYNTHETIC: LEGO1 0x10065750 +// LegoPointOfViewController::`scalar deleting destructor' + #endif /* LEGOPOINTOFVIEWCONTROLLER_H */ From 872c62fd39ac4341c3319fc793424d27d65c9525 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Tue, 9 Jan 2024 10:30:37 -0500 Subject: [PATCH 9/9] Match LegoCameraController::LegoCameraController --- LEGO1/realtime/matrix.cpp | 6 ------ LEGO1/realtime/matrix.h | 5 +++-- LEGO1/realtime/vector.h | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/LEGO1/realtime/matrix.cpp b/LEGO1/realtime/matrix.cpp index 61f7b1a9..818650eb 100644 --- a/LEGO1/realtime/matrix.cpp +++ b/LEGO1/realtime/matrix.cpp @@ -28,12 +28,6 @@ void Matrix4Impl::AnotherSetData(Matrix4& p_data) m_data = &p_data; } -// FUNCTION: LEGO1 0x10002370 -void Matrix4Impl::SetData(Matrix4& p_data) -{ - m_data = &p_data; -} - // FUNCTION: LEGO1 0x10002380 const Matrix4* Matrix4Impl::GetData() const { diff --git a/LEGO1/realtime/matrix.h b/LEGO1/realtime/matrix.h index 58db7a9f..c087d331 100644 --- a/LEGO1/realtime/matrix.h +++ b/LEGO1/realtime/matrix.h @@ -35,12 +35,13 @@ class Matrix4 { // SIZE 0x8 class Matrix4Impl { public: - inline Matrix4Impl(Matrix4& p_data) : m_data(&p_data) {} + inline Matrix4Impl(Matrix4& p_data) { SetData(p_data); } // vtable + 0x00 virtual void EqualsMatrixImpl(const Matrix4Impl* p_other); virtual void EqualsMatrixData(const Matrix4& p_matrix); - virtual void SetData(Matrix4& p_data); + // FUNCTION: LEGO1 0x10002370 + virtual void SetData(Matrix4& p_data) { m_data = &p_data; } virtual void AnotherSetData(Matrix4& p_data); // vtable + 0x10 diff --git a/LEGO1/realtime/vector.h b/LEGO1/realtime/vector.h index 5c31f24e..1af21c9a 100644 --- a/LEGO1/realtime/vector.h +++ b/LEGO1/realtime/vector.h @@ -61,7 +61,7 @@ struct Vector4 { class Vector2Impl { public: // FUNCTION: LEGO1 0x1000c0f0 - inline Vector2Impl(float* p_data) { this->SetData(p_data); } + inline Vector2Impl(float* p_data) { SetData(p_data); } // vtable + 0x00 (no virtual destructor) virtual void AddScalarImpl(float p_value) = 0; @@ -74,7 +74,7 @@ class Vector2Impl { virtual void DivScalarImpl(float* p_value) = 0; virtual float DotImpl(float* p_a, float* p_b) const = 0; // FUNCTION: LEGO1 0x10002060 - virtual void SetData(float* p_data) { this->m_data = p_data; } + virtual void SetData(float* p_data) { m_data = p_data; } // vtable + 0x20 virtual void EqualsImpl(float* p_data) = 0;