eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-19 08:49:18 +02:00
Code Issues 121 Wiki Activity

milek7/sim branch opengl 3.3 renderer import

Browse Source
This commit is contained in:
tmj-fstate
2019-10-26 15:17:09 +02:00
parent d24fccb4d7
commit 0fd23a53d9
90 changed files with 7629 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scenenode.cpp
View File

@@ -200,7 +200,7 @@ shape_node::import( cParser &Input, scene::node_data const &Nodedata ) {
// TBT, TODO: add methods to material manager to access these simpler
auto const texturehandle = (
m_data.material != null_handle ?
GfxRenderer->Material( m_data.material ).texture1 :
GfxRenderer->Material( m_data.material ).textures[0] :
null_handle );
auto const &texture = (
texturehandle ?
@@ -346,7 +346,7 @@ shape_node::convert( TSubModel const *Submodel ) {
m_data.lighting.diffuse = Submodel->f4Diffuse;
m_data.lighting.specular = Submodel->f4Specular;
m_data.material = Submodel->m_material;
m_data.translucent = ( true == GfxRenderer->Material( m_data.material ).has_alpha );
m_data.translucent = ( true == GfxRenderer->Material( m_data.material ).is_translucent() );
// NOTE: we set unlimited view range typical for terrain, because we don't expect to convert any other 3d models
m_data.rangesquared_max = std::numeric_limits<double>::max();