diff --git a/neo/idlib/gltfParser.h b/neo/idlib/gltfParser.h index fe1685f3..4b30d436 100644 --- a/neo/idlib/gltfParser.h +++ b/neo/idlib/gltfParser.h @@ -1,3 +1,31 @@ +/* +=========================================================================== + +Doom 3 BFG Edition GPL Source Code +Copyright (C) 2022 Harrie van Ginneken + +This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code"). + +Doom 3 BFG Edition Source Code is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +Doom 3 BFG Edition Source Code is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with Doom 3 BFG Edition Source Code. If not, see . + +In addition, the Doom 3 BFG Edition Source Code is also subject to certain additional terms. You should have received a copy of these additional terms immediately following the terms and conditions of the GNU General Public License which accompanied the Doom 3 BFG Edition Source Code. If not, please request a copy in writing from id Software at the address below. + +If you have questions concerning this license or the applicable additional terms, you may contact in writing id Software LLC, c/o ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA. + +=========================================================================== +*/ + #pragma once #include "containers/StrList.h" #include diff --git a/neo/idlib/sys/sys_assert.h b/neo/idlib/sys/sys_assert.h index 6db64f25..045a23b8 100644 --- a/neo/idlib/sys/sys_assert.h +++ b/neo/idlib/sys/sys_assert.h @@ -71,7 +71,7 @@ bool AssertFailed( const char* file, int line, const char* expression ); //====================== assert in release mode ======================= - #define idassert( x ) { (()0); } + #define idassert( x ) { ( ( void )0 ); } #undef assert diff --git a/neo/renderer/Model_gltf.cpp b/neo/renderer/Model_gltf.cpp index 431b1eca..3c6dad06 100644 --- a/neo/renderer/Model_gltf.cpp +++ b/neo/renderer/Model_gltf.cpp @@ -159,11 +159,16 @@ MapPolygonMesh* MapPolygonMesh::ConvertFromMeshGltf( const gltfMesh_Primitive* p } idVec3 normal; - +#if GLTF_YUP + // RB: proper glTF2 convention, requires Y-up export option ticked on in Blender + normal.x = vec.z; + normal.y = vec.x; + normal.z = vec.y; +#else normal.x = vec.x; normal.y = vec.y; normal.z = vec.z; - +#endif normal *= axisTransform; mesh->verts[i].SetNormal( normal ); } @@ -203,11 +208,16 @@ MapPolygonMesh* MapPolygonMesh::ConvertFromMeshGltf( const gltfMesh_Primitive* p } idVec3 tangent; - +#if GLTF_YUP + // RB: proper glTF2 convention, requires Y-up export option ticked on in Blender + tangent.x = vec.z; + tangent.y = vec.x; + tangent.z = vec.y; +#else tangent.x = vec.x; tangent.y = vec.y; tangent.z = vec.z; - +#endif tangent *= axisTransform; mesh->verts[i].SetTangent( tangent ); @@ -289,10 +299,16 @@ void ProcessSceneNode( idMapEntity* newEntity, gltfNode* node, idMat4& trans, gl } #endif idVec3 origin; - +#if GLTF_YUP + // RB: proper glTF2 convention, requires Y-up export option ticked on in Blender + origin.x = node->translation.z; + origin.y = node->translation.x; + origin.z = node->translation.y; +#else origin.x = node->translation.x; origin.y = node->translation.y; origin.z = node->translation.z; +#endif // files import as y-up. Use this transform to change the model to z-up. idMat3 rotation = idAngles( 0.0f, 0.0f, 90.0f ).ToMat3( ); @@ -535,6 +551,7 @@ void idRenderModelGLTF::InitFromFile( const char* fileName ) } } + if( surfaces.Num( ) <= 0 ) { common->Warning( "Couldn't load model: '%s'", name.c_str( ) );