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

* bigger components handles

Browse Source 
* render occluded brush vertices differently
disable NV_DRIVER_BUG workaround
remove RenderableWireframe::glColorPointer call
This commit is contained in:
Garux
2019-04-16 00:07:50 +03:00
parent eff4d4224c
commit f45f759b43
6 changed files with 118 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
libs/render.h
View File

@@ -287,6 +287,7 @@ struct Colour4b
};
const Colour4b colour_vertex( 0, 255, 0, 255 );
const Colour4b colour_occluded( 74, 150, 75, 255 );
const Colour4b colour_selected( 0, 0, 255, 255 );
inline bool operator<( const Colour4b& self, const Colour4b& other ){
@@ -768,6 +769,26 @@ inline bool operator!=( const PointVertex& self, const PointVertex& other ){
return !operator==( self, other );
}
struct DepthTestedPointVertex
{
Colour4b colour;
Vertex3f vertex;
GLuint query = 0;
DepthTestedPointVertex(){
}
~DepthTestedPointVertex(){
if( query != 0 )
glDeleteQueries( 1, &query );
}
DepthTestedPointVertex( Vertex3f _vertex )
: colour( Colour4b( 255, 255, 255, 255 ) ), vertex( _vertex ){
}
DepthTestedPointVertex( Vertex3f _vertex, Colour4b _colour )
: colour( _colour ), vertex( _vertex ){
}
};
/// \brief Standard vertex type for lit/textured meshes.
struct ArbitraryMeshVertex
{
@@ -821,21 +842,23 @@ inline ArbitraryMeshVertex arbitrarymeshvertex_quantised( const ArbitraryMeshVer
/// \brief Sets up the OpenGL colour and vertex arrays for \p array.
inline void pointvertex_gl_array( const PointVertex* array ){
glColorPointer( 4, GL_UNSIGNED_BYTE, sizeof( PointVertex ), &array->colour );
glVertexPointer( 3, GL_FLOAT, sizeof( PointVertex ), &array->vertex );
template<typename PointVertex_t>
inline void pointvertex_gl_array( const PointVertex_t* array ){
glColorPointer( 4, GL_UNSIGNED_BYTE, sizeof( PointVertex_t ), &array->colour );
glVertexPointer( 3, GL_FLOAT, sizeof( PointVertex_t ), &array->vertex );
}
template<typename PointVertex_t>
class RenderablePointArray : public OpenGLRenderable
{
const Array<PointVertex>& m_array;
const Array<PointVertex_t>& m_array;
const GLenum m_mode;
public:
RenderablePointArray( const Array<PointVertex>& array, GLenum mode )
RenderablePointArray( const Array<PointVertex_t>& array, GLenum mode )
: m_array( array ), m_mode( mode ){
}
void render( RenderStateFlags state ) const {
#define NV_DRIVER_BUG 1
#define NV_DRIVER_BUG 0
#if NV_DRIVER_BUG
glColorPointer( 4, GL_UNSIGNED_BYTE, 0, 0 );
glVertexPointer( 3, GL_FLOAT, 0, 0 );
@@ -928,6 +951,42 @@ void render( RenderStateFlags state ) const {
}
};
class RenderableDepthTestedPointArray : public OpenGLRenderable
{
Array<DepthTestedPointVertex>& m_array;
const GLenum m_mode;
public:
RenderableDepthTestedPointArray( Array<DepthTestedPointVertex>& array, GLenum mode )
: m_array( array ), m_mode( mode ){
}
void render( RenderStateFlags state ) const {
if( state & RENDER_COLOURWRITE ){ // render depending on visibility
for( auto& p : m_array ){
GLuint sampleCount;
glGetQueryObjectuiv( p.query, GL_QUERY_RESULT, &sampleCount );
if ( sampleCount == 0 ){
p.colour = colour_occluded;
}
else{
p.colour = colour_vertex;
}
}
pointvertex_gl_array( m_array.data() );
glDrawArrays( m_mode, 0, GLsizei( m_array.size() ) );
}
else{ // test visibility
for( auto& p : m_array ){
if( p.query == 0 )
glGenQueries( 1, &p.query );
glBeginQuery( GL_SAMPLES_PASSED, p.query );
glVertexPointer( 3, GL_FLOAT, 0, &p.vertex );
glDrawArrays( m_mode, 0, 1 );
glEndQuery( GL_SAMPLES_PASSED );
}
}
}
};
class RemapXYZ
{