Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CourseMap: initial parse progress; Area work #249

Merged
merged 10 commits into from
Dec 13, 2022
Merged

CourseMap: initial parse progress; Area work #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ade38d6
Add initial parse function implementation
vabold Nov 30, 2022
c330e0a
Create MapdataAreaAccessor; fill MapdataAreaBase
vabold Nov 30, 2022
2cb0b19
Add static assert for vtable insurance
vabold Nov 30, 2022
347fb62
Match CourseMap::parseGeoObjs
vabold Nov 30, 2022
d3bfd3e
Accessor WIP
vabold Dec 3, 2022
b622532
Merge branch 'course-map' into course-map-merge
vabold Dec 8, 2022
22129d4
Merge m8's work into branch
vabold Dec 8, 2022
6840658
Try to match MapdataEnemyPoint's dtor
vabold Dec 8, 2022
6fd3a25
Finish work on file for now
vabold Dec 10, 2022
587ba21
Add `size()` to match `CourseMap::getStage()`
vabold Dec 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pack/rel_objects.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ out/rel/data_808b2bd0_808b2c30.o
out/rel/bss_809bd6e0_809bd6e8.o
out/CourseMap.o
out/rel/rodata_8088fa40_8088faa0.o
out/rel/data_808b2c6c_808b2c78.o
out/DvdArchive.o
out/rel/text_80519670_8051c088.o
out/rel/rodata_8088fab7_8088fd60.o
Expand Down
2 changes: 1 addition & 1 deletion pack/rel_slices.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
enabled,name,textStart,textEnd,ctorsStart,ctorsEnd,dtorsStart,dtorsEnd,rodataStart,rodataEnd,dataStart,dataEnd,bssStart,bssEnd
1,source/game/system/CourseMap.cpp,0x80512694,0x80518cc0,,,,,0x8088fa38,0x8088fa40,0x808B2C30,0x808b2c6c,0x809BD6E8,0x809BD6EC
1,source/game/system/CourseMap.cpp,0x80512694,0x80518cc0,,,,,0x8088fa38,0x8088fa40,0x808B2C30,0x808b2c78,0x809BD6E8,0x809BD6EC
1,source/game/system/DvdArchive.cpp,0x80518CC0,0x80519670,,,,,0x8088FAA0,0x8088FAB7,0x808B2C78,0x808B2C84,,
1,source/game/system/GhostFile.cpp,0x8051c088,0x8051d4d4,,,,,,,0x808b2d38,0x808b2d50,,
1,source/game/system/Mii.cpp,0x80525f88,0x80525ff4,,,,,0x8088fd60,0x8088fd64,,,,
Expand Down
79 changes: 40 additions & 39 deletions pack/symbols.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9456,40 +9456,40 @@ global:
0x805127ec: 'CourseMap_init'
0x80512c10: 'loadFile__Q26System9CourseMapFlPCc'
0x80512c2c: '__ct__Q26System19MapdataFileAccessorFPCQ36System19MapdataFileAccessor5SData'
0x80512c6c: 'getCameraType__Q26System13MapdataCameraFv'
0x80512c78: 'getCameraCount__Q26System9CourseMapFv'
0x80512c94: 'getVersion__Q26System19MapdataFileAccessorFv'
0x80512c9c: 'getExtraValue__Q26System76MapdataAccessorBase$0Q26System13MapdataCamera$4Q36System13MapdataCamera5SData$1CFv'
0x80512cac: 'unk_80512cac'
0x80512cb4: 'unk_80512cb4'
0x80512c6c: 'getCameraType__Q26System13MapdataCameraCFv'
0x80512c78: 'getCameraCount__Q26System9CourseMapCFv'
0x80512c94: 'getVersion__Q26System19MapdataFileAccessorCFv'
0x80512c9c: 'getExtraValue__Q26System21MapdataCameraAccessorCFv'
0x80512cac: 'setIndex__Q26System15MapdataAreaBaseFUs'
0x80512cb4: 'getAreaCount__Q26System9CourseMapCFv'
0x80512cd0: 'getEnemyPointCount__Q26System9CourseMapCFv'
0x80512cec: 'getItemPointCount__Q26System9CourseMapCFv'
0x80512d08: 'getJugemPointCount__Q26System9CourseMapCFv'
0x80512d24: 'getStartPointCount__Q26System9CourseMapCFv'
0x80512d40: 'getStartConfig__Q26System12MapdataStageCFv'
0x80512d4c: 'getFlareColor__Q26System12MapdataStageCFv'
0x80512d58: 'flareToggleEnabled__Q26System12MapdataStageCFv'
0x80512d64: 'KmpHolder_parseStageinfo'
0x80512e84: 'unk_80512e84'
0x80512fa4: 'KmpHolder_parseCannonpoints'
0x805130c4: 'unk_805130c4'
0x805131e4: 'unk_805131e4'
0x80513304: 'KmpHolder_parseAreas'
0x80513398: 'unk_80513398'
0x80512d64: 'parseStage__Q26System9CourseMapFUl'
0x80512e84: 'parseMissionPoints__Q26System9CourseMapFUl'
0x80512fa4: 'parseCannonPoints__Q26System9CourseMapFUl'
0x805130c4: 'parseJugemPoints__Q26System9CourseMapFUl'
0x805131e4: 'parseCameras__Q26System9CourseMapFUl'
0x80513304: 'parseAreas__Q26System9CourseMapFUl'
0x80513398: 'parsePointInfo__Q26System9CourseMapFUl'
0x805134c8: 'KmpHolder_parseGlobalobjs'
0x80513600: 'unk_80513600'
0x80513640: 'KmpHolder_parseCheckpoints'
0x8051377c: 'KmpHolder_parseCheckpaths'
0x80513adc: 'unk_80513adc'
0x80513bfc: 'unk_80513bfc'
0x80513d18: 'KmpHolder_parseEnemyPoint'
0x80513e40: 'KmpHolder_parseEnemyPath'
0x80513adc: 'parseItemPoints__Q26System9CourseMapFUl'
0x80513bfc: 'parseItemPaths__Q26System9CourseMapFUl'
0x80513d18: 'parseEnemyPoints__Q26System9CourseMapFUl'
0x80513e40: 'parseEnemyPaths__Q26System9CourseMapFUl'
0x80513f5c: 'parseKartpoints__Q26System9CourseMapFUl'
0x805140dc: 'AreaHolder_get'
0x80514100: 'get__Q26System84MapdataAccessorBase$0Q26System17MapdataJugemPoint$4Q36System17MapdataJugemPoint5SData$1FUs'
0x80514124: 'get__Q26System25MapdataStartPointAccessorFUs'
0x80514148: 'getGeoObj__Q26System9CourseMapFUs'
0x80514194: 'unk_80514194'
0x805140dc: 'get__Q26System19MapdataAreaAccessorCFUs'
0x80514100: 'get__Q26System25MapdataJugemPointAccessorCFUs'
0x80514124: 'get__Q26System25MapdataStartPointAccessorCFUs'
0x80514148: 'getGeoObj__Q26System9CourseMapCFUs'
0x80514194: 'getPointInfo__Q26System13MapdataGeoObjCFv'
0x80514208: 'unk_80514208'
0x80514258: 'unk_80514258'
0x80514368: 'unk_80514368'
Expand All @@ -9501,11 +9501,11 @@ global:
0x8051486c: 'VEC3_sub'
0x805148a0: 'unk_805148a0'
0x80514b24: 'unk_80514b24'
0x80514b30: 'KmpHolder_getKartpoint'
0x80514b7c: 'KmpHolder_getEnemypoint'
0x80514bc8: 'unk_80514bc8'
0x80514b30: 'getStartPoint__Q26System9CourseMapCFUs'
0x80514b7c: 'getEnemyPoint__Q26System9CourseMapCFUs'
0x80514bc8: 'getEnemyPath__Q26System9CourseMapCFUs'
0x80514c30: 'unk_80514c30'
0x80514d3c: 'KmpHolder_getItempath'
0x80514d3c: 'getItemPoint__Q26System9CourseMapCFUs'
0x80514d88: 'unk_80514d88'
0x80514df0: 'unk_80514df0'
0x80515014: 'CheckpathHolder_findCheckpathForCheckpoint'
Expand All @@ -9517,27 +9517,27 @@ global:
0x805155e4: 'unk_805155e4'
0x80515624: 'unk_80515624'
0x80515a6c: 'unk_80515a6c'
0x80515c24: 'KmpHolder_getCheckpoint'
0x80515c24: 'getCheckPoint__Q26System9CourseMapCFUs'
0x80515c70: 'unk_80515c70'
0x80515cbc: 'unk_80515cbc'
0x80515d3c: 'unk_80515d3c'
0x80515e04: 'unk_80515e04'
0x80515e50: 'AreaHolder_construct'
0x80515e04: 'getPointInfo__Q26System9CourseMapCFUs'
0x80515e50: '__ct__Q26System19MapdataAreaAccessorFPCQ26System16KmpSectionHeader'
0x80515f8c: 'unk_80515f8c'
0x80516050: 'unk_80516050'
0x805160b0: 'unk_805160b0'
0x805160b0: 'isInside__Q26System15MapdataAreaBaseCFRCQ23EGG8Vector3f'
0x80516138: 'unk_80516138'
0x80516168: 'unk_80516168'
0x80516220: 'AreaBox_construct'
0x805163b4: 'unk_805163b4'
0x805163f4: 'unk_805163f4'
0x805164fc: 'AreaCylinder_construct'
0x80516688: 'unk_80516688'
0x80516768: 'KmpHolder_getArea'
0x805167b4: 'unk_805167b4'
0x80516768: 'getArea__Q26System9CourseMapCFUs'
0x805167b4: 'getAreaByPriority__Q26System9CourseMapCFUs'
0x80516808: 'unk_80516808'
0x80516a60: 'unk_80516a60'
0x80516bb0: 'unk_80516bb0'
0x80516bb0: 'getCamera__Q26System9CourseMapCFUs'
0x80516bfc: 'unk_80516bfc'
0x80516cd4: 'unk_80516cd4'
0x80516d4c: 'unk_80516d4c'
Expand All @@ -9556,15 +9556,15 @@ global:
0x80518268: 'unk_80518268'
0x805182cc: 'unk_805182cc'
0x80518344: 'unk_80518344'
0x805183a8: 'unk_805183a8'
0x805183a8: '__ct__Q26System17MapdataJugemPointFPCQ36System17MapdataJugemPoint5SData'
0x805184fc: 'unk_805184fc'
0x80518920: 'unk_80518920'
0x80518920: 'getJugemPoint__Q26System9CourseMapCFUs'
0x8051896c: 'unk_8051896c'
0x80518ab8: 'Vec3_fromScale'
0x80518ae0: 'KmpHolder_getCannonpoint'
0x80518b2c: 'unk_80518b2c'
0x80518b78: 'KmpHolder_getStageinfo'
0x80518bb0: 'unk_80518bb0'
0x80518ae0: 'getCannonPoint__Q26System9CourseMapCFUs'
0x80518b2c: 'getMissionPoint__Q26System9CourseMapCFUs'
0x80518b78: 'getStage__Q26System9CourseMapCFv'
0x80518bb0: 'getFlareAlpha__Q26System12MapdataStageCFv'
0x80518bdc: 'unk_80518bdc'
0x80518c40: 'Enemypoint_destroy'
0x80518cc0: '__ct__Q26System10DvdArchiveFv'
Expand Down Expand Up @@ -22550,6 +22550,7 @@ global:
0x808b2c48: '__vt__Q26System19MapdataAreaCylinder'
0x808b2c54: '__vt__Q26System14MapdataAreaBox'
0x808b2c60: '__vt__Q26System15MapdataAreaBase'
0x808b2c6c: '__vt__Q26System17MapdataEnemyPoint'
0x808b2c78: '__vt__Q26System10DvdArchive'
0x808b2d38: '__vt__Q26System14GhostFileGroup'
0x808b2d44: '__vt__Q26System4Time'
Expand Down
4 changes: 4 additions & 0 deletions source/egg/math/eggVector.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ struct Vector3f {
float y;
float z;

float dot() const {
return x*x + y*y + z*z;
}

float normalise();
// uses fsqrt directly
void normalise2();
Expand Down
Loading