From 94a3b2fa1fe01e54220b962b1ca027caaac01631 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 18 Oct 2020 16:10:53 +0200 Subject: [PATCH] build 201018. idexed geometry submodel format tweak --- Model3d.cpp | 5 +++-- version.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Model3d.cpp b/Model3d.cpp index ce4e01be..ea0af308 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -537,7 +537,7 @@ std::pair TSubModel::Load( cParser &parser, bool dynamic ) auto vertices { std::begin( Vertices ) }; for( auto idx = 0; idx < m_geometry.vertex_count; ++idx ) { auto vertex { vertices + idx }; - parser.getTokens( 3 + 3 + 2 + 3, false ); + parser.getTokens( 3 + 3 + 2 + 4, false ); parser >> vertex->position.x >> vertex->position.y @@ -549,7 +549,8 @@ std::pair TSubModel::Load( cParser &parser, bool dynamic ) >> vertex->texture.t >> vertex->tangent.x >> vertex->tangent.y - >> vertex->tangent.z; + >> vertex->tangent.z + >> vertex->tangent.w; } } else { diff --git a/version.h b/version.h index d7dfd424..3ebed691 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 20 -#define VERSION_MINOR 914 +#define VERSION_MINOR 1018 #define VERSION_REVISION 0