From 9c7691df85ca3e8c3ef5f273b4838770510a3958 Mon Sep 17 00:00:00 2001 From: Anakin Date: Tue, 8 Nov 2016 10:31:34 +0100 Subject: [PATCH] removed unused variables --- MshViewer/Header/Object.h | 11 ----------- MshViewer/Source/Object.cpp | 24 ------------------------ 2 files changed, 35 deletions(-) diff --git a/MshViewer/Header/Object.h b/MshViewer/Header/Object.h index de37568..8d0dabd 100644 --- a/MshViewer/Header/Object.h +++ b/MshViewer/Header/Object.h @@ -27,17 +27,6 @@ struct Modl { Mtyp type; std::uint32_t renderFlags; glm::mat4 m4x4Translation; - struct { - float scale[3]; - float rotation[4]; - float translation[3]; - } tran; - struct { - std::uint32_t type; - float data1; - float data2; - float data3; - } swci; std::string texture; float* vertex; float* uv; diff --git a/MshViewer/Source/Object.cpp b/MshViewer/Source/Object.cpp index 48d7f44..315eb56 100644 --- a/MshViewer/Source/Object.cpp +++ b/MshViewer/Source/Object.cpp @@ -79,20 +79,6 @@ void Object::setModlDefault(Modl * model) model->type = null; model->renderFlags = -1; model->m4x4Translation = glm::mat4(1.0f); - model->tran.scale[0] = 0; - model->tran.scale[1] = 0; - model->tran.scale[2] = 0; - model->tran.rotation[0] = 0; - model->tran.rotation[1] = 0; - model->tran.rotation[2] = 0; - model->tran.rotation[3] = 0; - model->tran.translation[0] = 0; - model->tran.translation[1] = 0; - model->tran.translation[2] = 0; - model->swci.type = -1; - model->swci.data1 = -1; - model->swci.data2 = -1; - model->swci.data3 = -1; model->texture = ""; model->vertex = NULL; model->uv = NULL; @@ -347,16 +333,6 @@ void Object::analyseModlChunks(Modl* dataDestination, std::list& c continue; } - - if (!strcmp("SWCI", (*it)->name)) - { - fsMesh.seekg((*it)->position); - fsMesh.read(reinterpret_cast(&dataDestination->swci.type), sizeof(dataDestination->swci.type)); - fsMesh.read(reinterpret_cast(&dataDestination->swci.data1), sizeof(dataDestination->swci.data1)); - fsMesh.read(reinterpret_cast(&dataDestination->swci.data2), sizeof(dataDestination->swci.data2)); - fsMesh.read(reinterpret_cast(&dataDestination->swci.data3), sizeof(dataDestination->swci.data3)); - continue; - } } }