eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change e3d position of diffuseMultiplier

Browse Source
This commit is contained in:
Hirek
2026-01-13 09:51:46 +01:00
parent b1bc93d06a
commit ada3583df2
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Model3d.cpp
View File

@@ -1720,7 +1720,6 @@ void TSubModel::serialize(std::ostream &s, std::vector<TSubModel *> &models, std
sn_utils::s_vec4(s, f4Ambient);
sn_utils::s_vec4(s, f4Diffuse);
sn_utils::ls_float32(s, diffuseMultiplier);
sn_utils::s_vec4(s, f4Specular);
sn_utils::s_vec4(s, f4Emision);
@@ -1741,6 +1740,10 @@ void TSubModel::serialize(std::ostream &s, std::vector<TSubModel *> &models, std
sn_utils::ls_int32(s, m_geometry.index_count);
sn_utils::ls_int32(s, m_geometry.index_offset);
// external data
sn_utils::ls_float32(s, diffuseMultiplier);
// fill empty space
size_t fill = end - s.tellp();
for (size_t i = 0; i < fill; i++)
s.put(0);
@@ -1890,10 +1893,6 @@ void TSubModel::deserialize(std::istream &s)
f4Ambient = sn_utils::d_vec4(s);
f4Diffuse = sn_utils::d_vec4(s);
diffuseMultiplier = sn_utils::ld_float32(s);
// only multiply diffuse on experimental renderer
if (!Global.NvRenderer)
f4Diffuse /= diffuseMultiplier;
f4Specular = sn_utils::d_vec4(s);
f4Emision = sn_utils::d_vec4(s);
@@ -1912,6 +1911,13 @@ void TSubModel::deserialize(std::istream &s)
// HACK: the values will be 0 also when reading legacy chunk
m_geometry.index_count = sn_utils::ld_int32(s);
m_geometry.index_offset = sn_utils::ld_int32(s);
// extra data block
diffuseMultiplier = sn_utils::ld_float32(s);
// only multiply diffuse on experimental renderer
if (!Global.NvRenderer)
f4Diffuse /= diffuseMultiplier;
// necessary rotations were already done during t3d->e3d conversion
m_rotation_init_done = true;
}