eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 17:29:18 +02:00
Code Issues 123 Wiki Activity

build 201018. idexed geometry submodel format tweak

Browse Source
This commit is contained in:
tmj-fstate
2020-10-18 16:10:53 +02:00
parent 954b908890
commit 94a3b2fa1f
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Model3d.cpp
View File

@@ -537,7 +537,7 @@ std::pair<int, int> TSubModel::Load( cParser &parser, bool dynamic )
auto vertices { std::begin( Vertices ) }; auto vertices { std::begin( Vertices ) };
for( auto idx = 0; idx < m_geometry.vertex_count; ++idx ) { for( auto idx = 0; idx < m_geometry.vertex_count; ++idx ) {
auto vertex { vertices + idx }; auto vertex { vertices + idx };
parser.getTokens( 3 + 3 + 2 + 3, false ); parser.getTokens( 3 + 3 + 2 + 4, false );
parser parser
>> vertex->position.x >> vertex->position.x
>> vertex->position.y >> vertex->position.y
@@ -549,7 +549,8 @@ std::pair<int, int> TSubModel::Load( cParser &parser, bool dynamic )
>> vertex->texture.t >> vertex->texture.t
>> vertex->tangent.x >> vertex->tangent.x
>> vertex->tangent.y >> vertex->tangent.y
>> vertex->tangent.z; >> vertex->tangent.z
>> vertex->tangent.w;
} }
} }
else { else {

2
version.h
View File

@@ -1,5 +1,5 @@
#pragma once #pragma once
#define VERSION_MAJOR 20 #define VERSION_MAJOR 20
#define VERSION_MINOR 914 #define VERSION_MINOR 1018
#define VERSION_REVISION 0 #define VERSION_REVISION 0