quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Radiant:

Browse Source 
misc...
	* extradebug_quicker BUILD mode (defines _DEBUG_QUICKER = no slowing down debug renderables)
	* draw bbox for having model + selected entities
This commit is contained in:
Garux
2017-08-02 09:32:49 +03:00
parent 969b901abe
commit bc5dcc1699
13 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/entity/eclassmodel.cpp
View File

@@ -54,6 +54,10 @@
#include "entity.h"
inline void read_aabb( AABB& aabb, const EntityClass& eclass ){
aabb = aabb_for_minmax( eclass.mins, eclass.maxs );
}
class EclassModel :
public Snappable
{
@@ -76,10 +80,16 @@ RenderablePivot m_renderOrigin;
RenderableNamedEntity m_renderName;
ModelSkinKey m_skin;
AABB m_aabb_local;
RenderableWireframeAABB m_aabb_wire;
Matrix4 m_translation;
Callback m_transformChanged;
Callback m_evaluateTransform;
void construct(){
read_aabb( m_aabb_local, m_entity.getEntityClass() );
default_rotation( m_rotation );
m_keyObservers.insert( "classname", ClassnameFilter::ClassnameChangedCaller( m_filter ) );
@@ -104,6 +114,8 @@ void updateTransform(){
m_transform.localToParent() = g_matrix4_identity;
matrix4_translate_by_vec3( m_transform.localToParent(), m_origin );
m_translation = m_transform.localToParent();
if ( g_gameType == eGameTypeDoom3 ) {
matrix4_multiply_by_matrix4( m_transform.localToParent(), rotation_toMatrix( m_rotation ) );
}
@@ -154,6 +166,8 @@ EclassModel( EntityClass* eclass, scene::Node& node, const Callback& transformCh
m_nameKeys( m_entity ),
m_renderName( m_named, g_vector3_identity ),
m_skin( SkinChangedCaller( *this ) ),
m_aabb_wire( m_aabb_local ),
m_translation( g_matrix4_identity ),
m_transformChanged( transformChanged ),
m_evaluateTransform( evaluateTransform ){
construct();
@@ -170,6 +184,8 @@ EclassModel( const EclassModel& other, scene::Node& node, const Callback& transf
m_nameKeys( m_entity ),
m_renderName( m_named, g_vector3_identity ),
m_skin( SkinChangedCaller( *this ) ),
m_aabb_wire( m_aabb_local ),
m_translation( g_matrix4_identity ),
m_transformChanged( transformChanged ),
m_evaluateTransform( evaluateTransform ){
construct();
@@ -228,8 +244,14 @@ void detach( scene::Traversable::Observer* observer ){
void renderSolid( Renderer& renderer, const VolumeTest& volume, const Matrix4& localToWorld, bool selected ) const {
if ( selected ) {
m_renderOrigin.render( renderer, volume, localToWorld );
}
renderer.PushState();
renderer.Highlight( Renderer::ePrimitive, false );
renderer.SetState( m_entity.getEntityClass().m_state_wire, Renderer::eWireframeOnly );
renderer.SetState( m_entity.getEntityClass().m_state_wire, Renderer::eFullMaterials );
renderer.addRenderable( m_aabb_wire, m_translation );
renderer.PopState();
}
renderer.SetState( m_entity.getEntityClass().m_state_wire, Renderer::eWireframeOnly );
}
void renderWireframe( Renderer& renderer, const VolumeTest& volume, const Matrix4& localToWorld, bool selected ) const {

1
plugins/entity/generic.cpp
View File

@@ -118,6 +118,7 @@ public:
void updateTransform(){
m_transform.localToParent() = g_matrix4_identity;
matrix4_translate_by_vec3( m_transform.localToParent(), m_origin );
//matrix4_transform_by_euler_xyz_degrees( m_transform.localToParent(), m_origin, m_angles, Vector3( 1, 1, 1 ) );
m_transformChanged();
}
typedef MemberCaller<GenericEntity, &GenericEntity::updateTransform> UpdateTransformCaller;

2
plugins/md3model/model.h
View File

@@ -180,7 +180,7 @@ void render( RenderStateFlags state ) const {
glEnd();
#endif
#if defined( _DEBUG )
#if defined( _DEBUG ) && !defined( _DEBUG_QUICKER )
glBegin( GL_LINES );
for ( VertexBuffer<ArbitraryMeshVertex>::const_iterator i = m_vertices.begin(); i != m_vertices.end(); ++i )

2
plugins/model/model.cpp
View File

@@ -113,7 +113,7 @@ void render( RenderStateFlags state ) const {
glVertexPointer( 3, GL_FLOAT, sizeof( ArbitraryMeshVertex ), &m_vertices.data()->vertex );
glDrawElements( GL_TRIANGLES, GLsizei( m_indices.size() ), RenderIndexTypeID, m_indices.data() );
#if defined( _DEBUG )
#if defined( _DEBUG ) && !defined( _DEBUG_QUICKER )
GLfloat modelview[16];
glGetFloatv( GL_MODELVIEW_MATRIX, modelview ); // I know this is slow as hell, but hey - we're in _DEBUG
Matrix4 modelview_inv(