diff --git a/README.md b/README.md index 3310da4a20..ac8ae00d1a 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Here is an overview of the changes made to TrenchBroom: * Doom 3 .map parser with brushDef3, patchDef2, patchDef3 primitives * Doom 3 Valve .map configuration * Quake 3 .shader parser adopted to support .mtr materials and RBDOOM-3-BFG specific extensions. It includes support for Doom 3 diffuse/basecolormap stages and the lookup for them is like in idMaterial::GetEditorImage() -* New Doom 3 OBJ parser. RBDOOM-3-BFG automatically creates OBJ files to work with TB and it also allows seamless interop with Blender 2.8x - 3.x without the need of additional model formats +* New Doom 3 OBJ parser. RBDOOM-3-BFG automatically creates OBJ files to work with TB and it also allows seamless interop with Blender 2.8x - 4.x without the need of additional model formats * RBDOOM-3-BFG >= 1.4 ships with TB specific helper entities like misc_model or func_rotating_model to reflect TrenchBroom's clean architecture and differentiation between Brush Entities and Point Entities * Game FGDs for Doom 3 and Doom 3 BFG * Custom PNG icons for special entities like lights, speakers, particle emitters, info_location, target_* and so on @@ -39,6 +39,7 @@ Here is an overview of the changes made to TrenchBroom: * Changed OBJ exporter so exported models can be easier reimported by RBDOOM-3-BFG * Changed Assimp glTF 2 importer so it will look for Doom 3 materials instead of trying to load embedded textures * Bezier patches can be copy pasted and copied out of other maps +* Replaced ray traced model picker code using TinyBVH which allows to load bigger glTF 2 maps almost instantly instead of minutes ## Issues * TrenchBroomBFG doesn't support brush primitives like in D3Radiant or DarkRadiant. Use the Valve 220 .map format instead diff --git a/common/src/Assets/EntityModelManager.cpp b/common/src/Assets/EntityModelManager.cpp index 4d2daded9a..557b82f6b2 100644 --- a/common/src/Assets/EntityModelManager.cpp +++ b/common/src/Assets/EntityModelManager.cpp @@ -202,7 +202,7 @@ std::unique_ptr EntityModelManager::loadModel(const IO::Path& path) m_logger.info() << "Loaded model '" << path << "' in " << std::chrono::duration_cast(endTime - startTime).count() - << "ms"; + << " ms"; return model; } diff --git a/common/src/Assets/TextureManager.cpp b/common/src/Assets/TextureManager.cpp index 1b397006fc..bcedd328b2 100644 --- a/common/src/Assets/TextureManager.cpp +++ b/common/src/Assets/TextureManager.cpp @@ -99,7 +99,7 @@ void TextureManager::setTextureCollections( << std::chrono::duration_cast( endTime - startTime) .count() - << "ms"; + << " ms"; addTextureCollection(std::move(collection)); } catch (const Exception& e) diff --git a/common/src/View/MapFrame.cpp b/common/src/View/MapFrame.cpp index 40c9567e4c..bb48721a87 100644 --- a/common/src/View/MapFrame.cpp +++ b/common/src/View/MapFrame.cpp @@ -1003,8 +1003,8 @@ bool MapFrame::openDocument( logger().info() << "Loaded " << m_document->path() << " in " - << std::chrono::duration_cast(endTime - startTime).count() - << "ms"; + << std::chrono::duration_cast(endTime - startTime).count() + << " seconds"; return true; }