summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-01-20 21:41:41 +0100
committerSergeanur <s.anureev@yandex.ua>2020-01-20 21:58:13 +0100
commita9f39d828426df60876f00a5d2164eb50879b5c9 (patch)
tree739e2dafe2617481334ba7f28a94b1733e19cc1a /src/core
parentPowerPoints (diff)
downloadre3-a9f39d828426df60876f00a5d2164eb50879b5c9.tar
re3-a9f39d828426df60876f00a5d2164eb50879b5c9.tar.gz
re3-a9f39d828426df60876f00a5d2164eb50879b5c9.tar.bz2
re3-a9f39d828426df60876f00a5d2164eb50879b5c9.tar.lz
re3-a9f39d828426df60876f00a5d2164eb50879b5c9.tar.xz
re3-a9f39d828426df60876f00a5d2164eb50879b5c9.tar.zst
re3-a9f39d828426df60876f00a5d2164eb50879b5c9.zip
Diffstat (limited to '')
-rw-r--r--src/core/FileLoader.cpp59
-rw-r--r--src/core/FileLoader.h2
-rw-r--r--src/core/Instance.h4
-rw-r--r--src/core/config.h3
4 files changed, 63 insertions, 5 deletions
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index 6f3b0971..4662b508 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -511,11 +511,11 @@ CFileLoader::LoadObjectTypes(const char *filename)
int pathIndex;
char pathTypeStr[20];
int id, pathType;
-// int mlo;
+ int mlo;
section = NONE;
pathIndex = -1;
-// mlo = 0;
+ mlo = 0;
debug("Loading object types from %s...\n", filename);
fd = CFileMgr::OpenFile(filename, "rb");
@@ -536,12 +536,12 @@ CFileLoader::LoadObjectTypes(const char *filename)
}else switch(section){
case OBJS:
if(strncmp(line, "sta", 3) == 0)
- assert(0); // LoadMLO
+ mlo = LoadMLO(line);
else
LoadObject(line);
break;
case MLO:
- assert(0); // LoadMLOInstance
+ LoadMLOInstance(mlo, line);
break;
case TOBJ:
LoadTimeObject(line);
@@ -644,6 +644,57 @@ CFileLoader::LoadObject(const char *line)
MatchModelString(model, id);
}
+int
+CFileLoader::LoadMLO(const char *line)
+{
+ char smth[8];
+ char name[24];
+ int modelIndex;
+ float someFloat;
+
+ sscanf(line, "%s %s %d %f", smth, name, &modelIndex, &someFloat);
+ CMloModelInfo *minfo = CModelInfo::AddMloModel(modelIndex);
+ minfo->SetName(name);
+ minfo->field_34 = someFloat;
+ int instId = CModelInfo::GetMloInstanceStore()->allocPtr;
+ minfo->firstInstance = instId;
+ minfo->lastInstance = instId;
+ minfo->SetTexDictionary("generic");
+ return modelIndex;
+}
+
+void
+CFileLoader::LoadMLOInstance(int id, const char *line)
+{
+ char name[24];
+ RwV3d pos, scale, rot;
+ float angle;
+ int modelIndex;
+
+ CMloModelInfo *minfo = (CMloModelInfo*)CModelInfo::GetModelInfo(id);
+ sscanf(line, "%d %s %f %f %f %f %f %f %f %f %f %f",
+ &modelIndex,
+ name,
+ &pos.x, &pos.y, &pos.z,
+ &scale.x, &scale.y, &scale.z,
+ &rot.x, &rot.y, &rot.z,
+ &angle);
+ float rad = 2.0f * (PI / 2.0f - atan2(angle, sqrt(1.0f - SQR(angle))));
+ CInstance *inst = CModelInfo::GetMloInstanceStore()->alloc();
+ minfo->lastInstance++;
+
+ RwMatrix *matrix = RwMatrixCreate();
+ RwMatrixScale(matrix, &scale, rwCOMBINEREPLACE);
+ RwMatrixRotate(matrix, &rot, -RADTODEG(rad), rwCOMBINEPOSTCONCAT);
+ RwMatrixTranslate(matrix, &pos, rwCOMBINEPOSTCONCAT);
+
+ inst->GetMatrix() = CMatrix(matrix);
+ inst->GetMatrix().UpdateRW();
+
+ inst->m_modelIndex = modelIndex;
+ RwMatrixDestroy(matrix);
+}
+
void
CFileLoader::LoadTimeObject(const char *line)
{
diff --git a/src/core/FileLoader.h b/src/core/FileLoader.h
index 7ef96da3..1b390279 100644
--- a/src/core/FileLoader.h
+++ b/src/core/FileLoader.h
@@ -23,6 +23,8 @@ public:
static void LoadObjectTypes(const char *filename);
static void LoadObject(const char *line);
+ static int LoadMLO(const char *line);
+ static void LoadMLOInstance(int id, const char *line);
static void LoadTimeObject(const char *line);
static void LoadClumpObject(const char *line);
static void LoadVehicleObject(const char *line);
diff --git a/src/core/Instance.h b/src/core/Instance.h
index bb74ea84..4a7f9aa9 100644
--- a/src/core/Instance.h
+++ b/src/core/Instance.h
@@ -4,8 +4,10 @@
// unused
-class CInstance : CPlaceable
+class CInstance : public CPlaceable
{
public:
+ int m_modelIndex;
+public:
~CInstance() = default;
};
diff --git a/src/core/config.h b/src/core/config.h
index cbaf4d9a..de96ad1b 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -11,10 +11,13 @@ enum Config {
CUTSCENEDIRSIZE = 512,
SIMPLEMODELSIZE = 5000,
+ MLOMODELSIZE = 1,
+ MLOINSTANCESIZE = 1,
TIMEMODELSIZE = 30,
CLUMPMODELSIZE = 5,
PEDMODELSIZE = 90,
VEHICLEMODELSIZE = 120,
+ XTRACOMPSMODELSIZE = 2,
TWODFXSIZE = 2000,
MAXVEHICLESLOADED = 50, // 70 on mobile