diff --git a/renderer.cpp b/renderer.cpp index b8366cf3..98ac8b80 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -819,14 +819,20 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f auto const zfar = Config.draw_range * Global.fDistanceFactor * Zfar; auto const znear = ( Znear > 0.f ? - Znear * zfar : - 0.1f * Global.ZoomFactor ); + Znear * zfar : + 0.1f * Global.ZoomFactor ); camera.projection() *= glm::perspective( glm::radians( Global.FieldOfView / Global.ZoomFactor ), std::max( 1.f, (float)Global.iWindowWidth ) / std::max( 1.f, (float)Global.iWindowHeight ), znear, zfar ); +/* + m_sunandviewangle = + glm::dot( + m_sunlight.direction, + glm::vec3( 0.f, 0.f, -1.f ) * glm::mat3( viewmatrix ) ); +*/ break; } case rendermode::shadows: { @@ -2965,7 +2971,7 @@ opengl_renderer::Render_Alpha( TTraction *Traction ) { ::glColor4fv( glm::value_ptr( glm::vec4{ - Traction->wire_color(), + Traction->wire_color() /* * ( DebugModeFlag ? 1.f : clamp( m_sunandviewangle, 0.25f, 1.f ) ) */, linealpha } ) ); // render m_geometry.draw( Traction->m_geometry ); @@ -3422,7 +3428,7 @@ opengl_renderer::Update_Pick_Control() { return control; } -editor::basic_node const * +scene::basic_node const * opengl_renderer::Update_Pick_Node() { #ifdef EU07_USE_PICKING_FRAMEBUFFER @@ -3457,7 +3463,7 @@ opengl_renderer::Update_Pick_Node() { unsigned char pickreadout[4]; ::glReadPixels( pickbufferpos.x, pickbufferpos.y, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, pickreadout ); auto const nodeindex = pick_index( glm::ivec3{ pickreadout[ 2 ], pickreadout[ 1 ], pickreadout[ 0 ] } ); - editor::basic_node const *node { nullptr }; + scene::basic_node const *node { nullptr }; if( ( nodeindex > 0 ) && ( nodeindex <= m_picksceneryitems.size() ) ) { node = m_picksceneryitems[ nodeindex - 1 ]; diff --git a/renderer.h b/renderer.h index f9b0281e..61fb1ab9 100644 --- a/renderer.h +++ b/renderer.h @@ -163,14 +163,14 @@ public: // utility methods TSubModel const * Pick_Control() const { return m_pickcontrolitem; } - editor::basic_node const * + scene::basic_node const * Pick_Node() const { return m_picksceneryitem; } // maintenance methods void Update( double const Deltatime ); TSubModel const * Update_Pick_Control(); - editor::basic_node const * + scene::basic_node const * Update_Pick_Node(); // debug methods std::string const & @@ -320,7 +320,9 @@ private: texture_manager m_textures; opengl_light m_sunlight; opengllight_array m_lights; - +/* + float m_sunandviewangle; // cached dot product of sunlight and camera vectors +*/ gfx::geometry_handle m_billboardgeometry { 0, 0 }; texture_handle m_glaretexture { -1 }; texture_handle m_suntexture { -1 }; @@ -386,8 +388,8 @@ private: renderpass_config m_cabshadowpass; // parameters of most recent cab shadowmap pass std::vector m_pickcontrolsitems; TSubModel const *m_pickcontrolitem { nullptr }; - std::vector m_picksceneryitems; - editor::basic_node const *m_picksceneryitem { nullptr }; + std::vector m_picksceneryitems; + scene::basic_node const *m_picksceneryitem { nullptr }; #ifdef EU07_USE_DEBUG_CAMERA renderpass_config m_worldcamera; // debug item #endif