From 35d809a145d66e0cf4fb15c9bbbbae3d5e794ce8 Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Sat, 18 Jun 2022 10:36:48 +0200 Subject: [PATCH] Astyle --- neo/idlib/gltfProperties.h | 44 +++++++++++++++++++------------- neo/renderer/Model_gltf.cpp | 51 +++++++++++++++++++++++-------------- neo/renderer/Model_gltf.h | 4 +-- 3 files changed, 61 insertions(+), 38 deletions(-) diff --git a/neo/idlib/gltfProperties.h b/neo/idlib/gltfProperties.h index 51a42057..29817574 100644 --- a/neo/idlib/gltfProperties.h +++ b/neo/idlib/gltfProperties.h @@ -813,14 +813,16 @@ public: return nullptr; } - gltfNode *GetNode(gltfScene * scene ,gltfMesh * mesh) { + gltfNode* GetNode( gltfScene* scene , gltfMesh* mesh ) + { assert( scene ); assert( mesh ); - auto & nodeList = scene->nodes; - for ( auto & nodeId : nodeList ) + auto& nodeList = scene->nodes; + for( auto& nodeId : nodeList ) { - if ( nodes[nodeId]->mesh != -1 && *&meshes[nodes[nodeId]->mesh] == mesh ) { + if( nodes[nodeId]->mesh != -1 &&*& meshes[nodes[nodeId]->mesh] == mesh ) + { return nodes[nodeId]; } } @@ -828,19 +830,24 @@ public: return nullptr; } - gltfNode *GetNode(idStr sceneName, idStr name ) { - int sceneId = GetSceneId(sceneName); - if (sceneId < 0 || sceneId > scenes.Num() ) + gltfNode* GetNode( idStr sceneName, idStr name ) + { + int sceneId = GetSceneId( sceneName ); + if( sceneId < 0 || sceneId > scenes.Num() ) + { return nullptr; + } - gltfScene *scene = scenes[sceneId]; + gltfScene* scene = scenes[sceneId]; assert( scene ); assert( name[0] ); - auto &nodeList = scene->nodes; - for ( auto &nodeId : nodeList ) { - if ( nodes[nodeId]->name == name ) { + auto& nodeList = scene->nodes; + for( auto& nodeId : nodeList ) + { + if( nodes[nodeId]->name == name ) + { return nodes[nodeId]; } } @@ -848,13 +855,16 @@ public: return nullptr; } - gltfNode *GetNode( gltfScene *scene, idStr name) { + gltfNode* GetNode( gltfScene* scene, idStr name ) + { assert( scene ); assert( name[0] ); - auto &nodeList = scene->nodes; - for ( auto &nodeId : nodeList ) { - if ( nodes[nodeId]->name == name ) { + auto& nodeList = scene->nodes; + for( auto& nodeId : nodeList ) + { + if( nodes[nodeId]->name == name ) + { return nodes[nodeId]; } } @@ -1026,8 +1036,8 @@ private: idList assetData; idList samplers; idList bufferViews; - idList textures; - idList accessors; + idList textures; + idList accessors; idList extensionsUsed; idList meshes; int scene; diff --git a/neo/renderer/Model_gltf.cpp b/neo/renderer/Model_gltf.cpp index bffe9ca1..4cdd05f4 100644 --- a/neo/renderer/Model_gltf.cpp +++ b/neo/renderer/Model_gltf.cpp @@ -231,7 +231,7 @@ MapPolygonMesh* MapPolygonMesh::ConvertFromMeshGltf( const gltfMesh_Primitive* p return mesh; } -void ProcessSceneNode( idMapEntity* newEntity, gltfNode* node, idMat4 & trans, gltfData* data , bool staticMesh = false ) +void ProcessSceneNode( idMapEntity* newEntity, gltfNode* node, idMat4& trans, gltfData* data , bool staticMesh = false ) { auto& nodeList = data->NodeList( ); @@ -378,7 +378,7 @@ bool gltfManager::ExtractMeshIdentifier( idStr& filename, int& meshId, idStr& me return false; } -void idRenderModelGLTF::ProcessNode( gltfNode * modelNode, idMat4 trans, gltfData * data ) +void idRenderModelGLTF::ProcessNode( gltfNode* modelNode, idMat4 trans, gltfData* data ) { auto& meshList = data->MeshList(); auto& nodeList = data->NodeList( ); @@ -386,25 +386,30 @@ void idRenderModelGLTF::ProcessNode( gltfNode * modelNode, idMat4 trans, gltfDat gltfData::ResolveNodeMatrix( modelNode ); idMat4 curTrans = trans * modelNode->matrix; - gltfMesh *targetMesh = meshList[modelNode->mesh]; + gltfMesh* targetMesh = meshList[modelNode->mesh]; - for ( auto prim : targetMesh->primitives ) { + for( auto prim : targetMesh->primitives ) + { - auto *newMesh = MapPolygonMesh::ConvertFromMeshGltf( prim, data, curTrans ); + auto* newMesh = MapPolygonMesh::ConvertFromMeshGltf( prim, data, curTrans ); modelSurface_t surf; - gltfMaterial *mat = NULL; - if ( prim->material != -1 ) { + gltfMaterial* mat = NULL; + if( prim->material != -1 ) + { mat = data->MaterialList( )[prim->material]; } - if ( mat != NULL && !gltf_ForceBspMeshTexture.GetBool( ) ) { + if( mat != NULL && !gltf_ForceBspMeshTexture.GetBool( ) ) + { surf.shader = declManager->FindMaterial( mat->name ); - } else { + } + else + { surf.shader = declManager->FindMaterial( "textures/base_wall/snpanel2rust" ); } surf.id = this->NumSurfaces( ); - srfTriangles_t *tri = R_AllocStaticTriSurf( ); + srfTriangles_t* tri = R_AllocStaticTriSurf( ); tri->numIndexes = newMesh->GetNumPolygons( ) * 3; tri->numVerts = newMesh->GetNumVertices( ); @@ -412,16 +417,18 @@ void idRenderModelGLTF::ProcessNode( gltfNode * modelNode, idMat4 trans, gltfDat R_AllocStaticTriSurfVerts( tri, tri->numVerts ); int indx = 0; - for ( int i = 0; i < newMesh->GetNumPolygons( ); i++ ) { - auto &face = newMesh->GetFace( i ); - auto &faceIdxs = face.GetIndexes( ); + for( int i = 0; i < newMesh->GetNumPolygons( ); i++ ) + { + auto& face = newMesh->GetFace( i ); + auto& faceIdxs = face.GetIndexes( ); tri->indexes[indx] = faceIdxs[0]; tri->indexes[indx + 1] = faceIdxs[1]; tri->indexes[indx + 2] = faceIdxs[2]; indx += 3; } - for ( int i = 0; i < tri->numVerts; ++i ) { + for( int i = 0; i < tri->numVerts; ++i ) + { tri->verts[i] = newMesh->GetDrawVerts( )[i]; tri->bounds.AddPoint( tri->verts[i].xyz ); } @@ -432,7 +439,8 @@ void idRenderModelGLTF::ProcessNode( gltfNode * modelNode, idMat4 trans, gltfDat AddSurface( surf ); } - for ( auto &child : modelNode->children ) { + for( auto& child : modelNode->children ) + { ProcessNode( nodeList[child], curTrans, data ); } } @@ -461,11 +469,16 @@ void idRenderModelGLTF::InitFromFile( const char* fileName ) bounds.Clear( ); - gltfNode * modelNode = data->GetNode("models",meshName);\ - if ( modelNode ) - ProcessNode(modelNode,mat4_identity,data); + gltfNode* modelNode = data->GetNode( "models", meshName ); + \ + if( modelNode ) + { + ProcessNode( modelNode, mat4_identity, data ); + } else - common->Warning(" gltfNode %s not found in models scene" ); + { + common->Warning( " gltfNode %s not found in models scene" ); + } //skin //gltfNode * modelNode = data->GetNode(data->SceneList()[data->GetSceneId("models")],targetMesh); diff --git a/neo/renderer/Model_gltf.h b/neo/renderer/Model_gltf.h index d0fe4512..818942da 100644 --- a/neo/renderer/Model_gltf.h +++ b/neo/renderer/Model_gltf.h @@ -42,6 +42,6 @@ public: { return false; } -private: - void ProcessNode( gltfNode * modelNode, idMat4 trans, gltfData * data ); +private: + void ProcessNode( gltfNode* modelNode, idMat4 trans, gltfData* data ); }; \ No newline at end of file