Archive/portal64-still-alive
1
0
Fork 0
mirror of https://github.com/mwpenny/portal64-still-alive.git synced 2024-10-19 10:17:36 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename skeletool loadScene() isLevel argument to shouldSimplify and invert logic

Browse source 
This is more accurate to what the code is actually used for, making it
easier to understand.
This commit is contained in:
Matt Penny 2024-10-05 00:07:13 -04:00
parent a652558a4c
commit 6607838b8d
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
skelatool64/main.cpp
View file

@ -125,7 +125,7 @@ int main(int argc, char *argv[]) {
hasError = true;
}
} else {
aiScene* materialScene = loadScene(*materialFile, false, settings.mVertexCacheSize, 0);
aiScene* materialScene = loadScene(*materialFile, true, settings.mVertexCacheSize, 0);
if (!materialScene) {
hasError = true;
@ -157,7 +157,7 @@ int main(int argc, char *argv[]) {
if (args.mInputFile.length()) {
std::cout << "Generating from mesh " << args.mInputFile << std::endl;
scene = loadScene(args.mInputFile, args.mProcessAsModel || args.mOutputType != FileOutputType::Mesh, settings.mVertexCacheSize, additionalPFlags);
scene = loadScene(args.mInputFile, args.mOutputType == FileOutputType::Mesh && !args.mProcessAsModel, settings.mVertexCacheSize, additionalPFlags);
if (!scene) {
return 1;

6
skelatool64/src/SceneLoader.cpp
View file

@ -5,7 +5,7 @@
#include "SceneModification.h"
#include <iostream>
aiScene* loadScene(const std::string& filename, bool isLevel, int vertexCacheSize, unsigned int additionalPFlags) {
aiScene* loadScene(const std::string& filename, bool shouldSimplify, int vertexCacheSize, unsigned int additionalPFlags) {
Assimp::Importer importer;
importer.SetPropertyInteger(AI_CONFIG_PP_LBW_MAX_WEIGHTS, 1);
@ -16,7 +16,7 @@ aiScene* loadScene(const std::string& filename, bool isLevel, int vertexCacheSiz
aiProcess_OptimizeMeshes |
additionalPFlags;
if (!isLevel) {
if (shouldSimplify) {
importer.SetPropertyInteger(AI_CONFIG_PP_SBP_REMOVE, aiPrimitiveType_POINT | aiPrimitiveType_LINE);
pFlags |= aiProcess_OptimizeGraph | aiProcess_SortByPType;
}
@ -28,7 +28,7 @@ aiScene* loadScene(const std::string& filename, bool isLevel, int vertexCacheSiz
return 0;
}
if (!isLevel) {
if (shouldSimplify) {
std::cout << "Splitting scenes by bones" << std::endl;
splitSceneByBones(const_cast<aiScene*>(scene));
}

2
skelatool64/src/SceneLoader.h
View file

@ -4,6 +4,6 @@
#include <assimp/scene.h>
#include <string>
aiScene* loadScene(const std::string& filename, bool isLevel, int vertexCacheSize, unsigned int additionalPFlags);
aiScene* loadScene(const std::string& filename, bool shouldSimplify, int vertexCacheSize, unsigned int additionalPFlags);
#endif