isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-30 11:41:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove incorrect deps to Omni

Browse Source
This commit is contained in:
Christian Semmler 2024-01-24 19:58:43 -05:00
parent fda3e4a917
commit 01991d1843
4 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -107,7 +107,7 @@ add_library(roi STATIC
) )
register_lego1_target(roi) register_lego1_target(roi)
set_property(TARGET roi PROPERTY ARCHIVE_OUTPUT_NAME "roi$<$<CONFIG:Debug>:d>") set_property(TARGET roi PROPERTY ARCHIVE_OUTPUT_NAME "roi$<$<CONFIG:Debug>:d>")
target_include_directories(roi PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/util") target_include_directories(roi PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
target_link_libraries(roi PRIVATE realtime) target_link_libraries(roi PRIVATE realtime)
add_library(misc STATIC add_library(misc STATIC
@ -118,7 +118,7 @@ add_library(misc STATIC
register_lego1_target(misc) register_lego1_target(misc)
set_property(TARGET misc PROPERTY ARCHIVE_OUTPUT_NAME "misc$<$<CONFIG:Debug>:d>") set_property(TARGET misc PROPERTY ARCHIVE_OUTPUT_NAME "misc$<$<CONFIG:Debug>:d>")
target_include_directories(misc PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/util") target_include_directories(misc PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/util")
target_link_libraries(misc PRIVATE ) target_link_libraries(misc PRIVATE)
add_library(omni STATIC add_library(omni STATIC
LEGO1/omni/src/action/mxdsaction.cpp LEGO1/omni/src/action/mxdsaction.cpp
@ -216,7 +216,7 @@ add_library(3dmanager STATIC
) )
register_lego1_target(3dmanager) register_lego1_target(3dmanager)
set_property(TARGET 3dmanager PROPERTY ARCHIVE_OUTPUT_NAME "3dmanager$<$<CONFIG:Debug>:d>") set_property(TARGET 3dmanager PROPERTY ARCHIVE_OUTPUT_NAME "3dmanager$<$<CONFIG:Debug>:d>")
target_include_directories(3dmanager PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1/omni/include" "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util") target_include_directories(3dmanager PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
target_link_libraries(3dmanager PRIVATE Vec::Vec) target_link_libraries(3dmanager PRIVATE Vec::Vec)
add_library(lego1 SHARED add_library(lego1 SHARED

32
LEGO1/lego/sources/roi/legoroi.cpp
View File

@ -7,10 +7,10 @@ DECOMP_SIZE_ASSERT(LegoROI, 0x10c);
// SIZE 0x14 // SIZE 0x14
typedef struct { typedef struct {
const char* m_name; const char* m_name;
MxS32 m_red; int m_red;
MxS32 m_green; int m_green;
MxS32 m_blue; int m_blue;
MxS32 m_unk0x10; int m_unk0x10;
} ROIColorAlias; } ROIColorAlias;
// GLOBAL: LEGO1 0x100dbe28 // GLOBAL: LEGO1 0x100dbe28
@ -32,7 +32,7 @@ ROIColorAlias g_roiColorAliases[22] = {
}; };
// GLOBAL: LEGO1 0x10101368 // GLOBAL: LEGO1 0x10101368
MxS32 g_roiConfig = 100; int g_roiConfig = 100;
// GLOBAL: LEGO1 0x101013ac // GLOBAL: LEGO1 0x101013ac
ROIHandler g_someHandlerFunction = NULL; ROIHandler g_someHandlerFunction = NULL;
@ -54,24 +54,24 @@ void LegoROI::FUN_100a58f0(Matrix4& p_transform)
} }
// FUNCTION: LEGO1 0x100a81c0 // FUNCTION: LEGO1 0x100a81c0
void LegoROI::configureLegoROI(MxS32 p_roiConfig) void LegoROI::configureLegoROI(int p_roiConfig)
{ {
g_roiConfig = p_roiConfig; g_roiConfig = p_roiConfig;
} }
// STUB: LEGO1 0x100a9a50 // STUB: LEGO1 0x100a9a50
LegoROI::LegoROI(Tgl::Renderer* p_renderer, ViewLODList* p_lodList, MxTime p_time) : ViewROI(p_renderer, p_lodList) LegoROI::LegoROI(Tgl::Renderer* p_renderer, ViewLODList* p_lodList, int p_time) : ViewROI(p_renderer, p_lodList)
{ {
m_time = p_time; m_time = p_time;
} }
// FUNCTION: LEGO1 0x100a9bf0 // FUNCTION: LEGO1 0x100a9bf0
MxBool LegoROI::CallTheHandlerFunction( unsigned char LegoROI::CallTheHandlerFunction(
char* p_param, char* p_param,
MxFloat& p_red, float& p_red,
MxFloat& p_green, float& p_green,
MxFloat& p_blue, float& p_blue,
MxFloat& p_other float& p_other
) )
{ {
// TODO // TODO
@ -88,11 +88,11 @@ MxBool LegoROI::CallTheHandlerFunction(
} }
// FUNCTION: LEGO1 0x100a9c50 // FUNCTION: LEGO1 0x100a9c50
MxBool LegoROI::ColorAliasLookup(char* p_param, MxFloat& p_red, MxFloat& p_green, MxFloat& p_blue, MxFloat& p_other) unsigned char LegoROI::ColorAliasLookup(char* p_param, float& p_red, float& p_green, float& p_blue, float& p_other)
{ {
// TODO: this seems awfully hacky for these devs. is there a dynamic way // TODO: this seems awfully hacky for these devs. is there a dynamic way
// to represent `the end of this array` that would improve this? // to represent `the end of this array` that would improve this?
MxU32 i = 0; unsigned int i = 0;
do { do {
if (strcmpi(g_roiColorAliases[i].m_name, p_param) == 0) { if (strcmpi(g_roiColorAliases[i].m_name, p_param) == 0) {
p_red = g_roiColorAliases[i].m_red * g_normalizeByteToFloat; p_red = g_roiColorAliases[i].m_red * g_normalizeByteToFloat;
@ -102,7 +102,7 @@ MxBool LegoROI::ColorAliasLookup(char* p_param, MxFloat& p_red, MxFloat& p_green
return TRUE; return TRUE;
} }
i++; i++;
} while ((MxS32*) &g_roiColorAliases[i] < &g_roiConfig); } while ((int*) &g_roiColorAliases[i] < &g_roiConfig);
return FALSE; return FALSE;
} }
@ -114,7 +114,7 @@ void LegoROI::SetSomeHandlerFunction(ROIHandler p_func)
} }
// FUNCTION: LEGO1 0x100a9e10 // FUNCTION: LEGO1 0x100a9e10
void LegoROI::SetDisplayBB(MxS32 p_displayBB) void LegoROI::SetDisplayBB(int p_displayBB)
{ {
// Intentionally empty function // Intentionally empty function
} }

23
LEGO1/lego/sources/roi/legoroi.h
View File

@ -1,10 +1,9 @@
#ifndef LEGOROI_H #ifndef LEGOROI_H
#define LEGOROI_H #define LEGOROI_H
#include "mxtypes.h"
#include "viewmanager/viewroi.h" #include "viewmanager/viewroi.h"
typedef MxBool (*ROIHandler)(char*, char*, MxU32); typedef unsigned char (*ROIHandler)(char*, char*, unsigned int);
class LegoEntity; class LegoEntity;
@ -18,24 +17,24 @@ class AutoROI : public ViewROI {};
// SIZE 0x10c // SIZE 0x10c
class LegoROI : public ViewROI { class LegoROI : public ViewROI {
public: public:
LegoROI(Tgl::Renderer* p_renderer, ViewLODList* p_lodList, MxTime p_time); LegoROI(Tgl::Renderer* p_renderer, ViewLODList* p_lodList, int p_time);
virtual float IntrinsicImportance() const override; // vtable+0x4 virtual float IntrinsicImportance() const override; // vtable+0x4
// Note: Actually part of parent class (doesn't exist yet) // Note: Actually part of parent class (doesn't exist yet)
virtual void UpdateWorldBoundingVolumes() override; // vtable+0x18 virtual void UpdateWorldBoundingVolumes() override; // vtable+0x18
__declspec(dllexport) void SetDisplayBB(MxS32 p_displayBB); __declspec(dllexport) void SetDisplayBB(int p_displayBB);
__declspec(dllexport) static void configureLegoROI(MxS32 p_roi); __declspec(dllexport) static void configureLegoROI(int p_roi);
static void SetSomeHandlerFunction(ROIHandler p_func); static void SetSomeHandlerFunction(ROIHandler p_func);
static MxBool CallTheHandlerFunction( static unsigned char CallTheHandlerFunction(
char* p_param, char* p_param,
MxFloat& p_red, float& p_red,
MxFloat& p_green, float& p_green,
MxFloat& p_blue, float& p_blue,
MxFloat& p_other float& p_other
); );
static MxBool ColorAliasLookup(char* p_param, MxFloat& p_red, MxFloat& p_green, MxFloat& p_blue, MxFloat& p_other); static unsigned char ColorAliasLookup(char* p_param, float& p_red, float& p_green, float& p_blue, float& p_other);
void WrappedSetLocalTransform(Matrix4& p_transform); void WrappedSetLocalTransform(Matrix4& p_transform);
void FUN_100a46b0(Matrix4& p_transform); void FUN_100a46b0(Matrix4& p_transform);
@ -50,7 +49,7 @@ class LegoROI : public ViewROI {
private: private:
undefined m_pad[0x24]; // 0xe0 undefined m_pad[0x24]; // 0xe0
LegoEntity* m_unk0x104; // 0x104 LegoEntity* m_unk0x104; // 0x104
MxTime m_time; // 0x108 int m_time; // 0x108
}; };
#endif // LEGOROI_H #endif // LEGOROI_H

2
tools/ncc/skip.yml
View File

@ -2,7 +2,7 @@ configureLegoAnimationManager(MxS32): 'DLL exported function'
configureLegoBuildingManager(MxS32): 'DLL exported function' configureLegoBuildingManager(MxS32): 'DLL exported function'
configureLegoModelPresenter(MxS32): 'DLL exported function' configureLegoModelPresenter(MxS32): 'DLL exported function'
configureLegoPartPresenter(MxS32, MxS32): 'DLL exported function' configureLegoPartPresenter(MxS32, MxS32): 'DLL exported function'
configureLegoROI(MxS32): 'DLL exported function' configureLegoROI(int): 'DLL exported function'
configureLegoWorldPresenter(MxS32): 'DLL exported function' configureLegoWorldPresenter(MxS32): 'DLL exported function'
GetNoCD_SourceName(): 'DLL exported function' GetNoCD_SourceName(): 'DLL exported function'
m_3dView: 'Allow this variable name' m_3dView: 'Allow this variable name'