mirror of
https://github.com/Garux/netradiant-custom.git
synced 2026-09-28 00:00:03 +02:00
indicate model loading failure by nomodel.png
This commit is contained in:
@@ -354,7 +354,7 @@ private:
|
||||
*j++ = i;
|
||||
}
|
||||
|
||||
m_shader = "";
|
||||
m_shader = "nomodel";
|
||||
|
||||
UpdateAABB();
|
||||
}
|
||||
|
||||
@@ -548,7 +548,7 @@ inline void Model_constructNull( Model& model ){
|
||||
surface.indices().insert( *i );
|
||||
}
|
||||
|
||||
surface.setShader( "" );
|
||||
surface.setShader( "nomodel" );
|
||||
|
||||
surface.updateAABB();
|
||||
|
||||
|
||||
@@ -293,7 +293,7 @@ private:
|
||||
*j++ = *i;
|
||||
}
|
||||
|
||||
m_shader = "";
|
||||
m_shader = "nomodel";
|
||||
|
||||
UpdateAABB();
|
||||
}
|
||||
|
||||
@@ -955,7 +955,10 @@ public:
|
||||
if ( m_pTexture->texture_number == 0 ) {
|
||||
m_notfound = m_pTexture;
|
||||
|
||||
const auto name = StringStream( GlobalRadiant().getAppPath(), "bitmaps/", ( IsDefault() ? "notex.png" : "shadernotex.png" ) );
|
||||
const auto name = StringStream( GlobalRadiant().getAppPath(), "bitmaps/",
|
||||
( string_equal( m_template.getName(), "nomodel" )? "nomodel.png"
|
||||
: IsDefault() ? "notex.png"
|
||||
: "shadernotex.png" ) );
|
||||
m_pTexture = GlobalTexturesCache().capture( LoadImageCallback( 0, loadBitmap ), name );
|
||||
}
|
||||
|
||||
|
||||
@@ -47,10 +47,10 @@ class NullModel :
|
||||
RenderableWireframeAABB m_aabb_wire;
|
||||
public:
|
||||
NullModel() : m_aabb_local( Vector3( 0, 0, 0 ), Vector3( 8, 8, 8 ) ), m_aabb_solid( m_aabb_local ), m_aabb_wire( m_aabb_local ){
|
||||
m_state = GlobalShaderCache().capture( "" );
|
||||
m_state = GlobalShaderCache().capture( "nomodel" );
|
||||
}
|
||||
~NullModel(){
|
||||
GlobalShaderCache().release( "" );
|
||||
GlobalShaderCache().release( "nomodel" );
|
||||
}
|
||||
|
||||
VolumeIntersectionValue intersectVolume( const VolumeTest& volume, const Matrix4& localToWorld ) const override {
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 3.6 KiB |
Reference in New Issue
Block a user