X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fpatch.h;h=6e8742b0daf0c588b7d12aaa8c0c9387841fc389;hb=cc23ea85efbc4070d4516385143a2bfb5747cc30;hp=a1f1d272a20a682bb987337d12f8f481925d787b;hpb=dac8329952745dbb494bad1c301e44bab05ec0db;p=xonotic%2Fnetradiant.git diff --git a/radiant/patch.h b/radiant/patch.h index a1f1d272..6e8742b0 100644 --- a/radiant/patch.h +++ b/radiant/patch.h @@ -30,7 +30,7 @@ /// The surface is recursively tesselated until the angle between each triangle /// edge is smaller than a specified tolerance. - +#include "globaldefs.h" #include "nameable.h" #include "ifilter.h" #include "imap.h" @@ -317,7 +317,7 @@ void render( RenderStateFlags state ) const { } } -#if defined( _DEBUG ) +#if GDEF_DEBUG RenderNormals(); #endif } @@ -447,8 +447,8 @@ RenderableIndexBuffer m_render_lattice; bool m_bOverlay; bool m_transformChanged; -Callback m_evaluateTransform; -Callback m_boundsChanged; +Callback m_evaluateTransform; +Callback m_boundsChanged; void construct(){ m_bOverlay = false; @@ -465,14 +465,14 @@ void construct(){ } public: -Callback m_lightsChanged; +Callback m_lightsChanged; static int m_CycleCapIndex; // = 0; static EPatchType m_type; STRING_CONSTANT( Name, "Patch" ); -Patch( scene::Node& node, const Callback& evaluateTransform, const Callback& boundsChanged ) : +Patch( scene::Node& node, const Callback& evaluateTransform, const Callback& boundsChanged ) : m_node( &node ), m_shader( texdef_name_default() ), m_state( 0 ), @@ -488,7 +488,7 @@ Patch( scene::Node& node, const Callback& evaluateTransform, const Callback& bou m_boundsChanged( boundsChanged ){ construct(); } -Patch( const Patch& other, scene::Node& node, const Callback& evaluateTransform, const Callback& boundsChanged ) : +Patch( const Patch& other, scene::Node& node, const Callback& evaluateTransform, const Callback& boundsChanged ) : m_node( &node ), m_shader( texdef_name_default() ), m_state( 0 ), @@ -674,7 +674,7 @@ void transformChanged(){ m_lightsChanged(); SceneChangeNotify(); } -typedef MemberCaller TransformChangedCaller; +typedef MemberCaller TransformChangedCaller; void evaluateTransform(){ if ( m_transformChanged ) { @@ -1338,7 +1338,7 @@ typedef LazyStatic StaticTypeCasts; void lightsChanged(){ m_lightList->lightsChanged(); } -typedef MemberCaller LightsChangedCaller; +typedef MemberCaller LightsChangedCaller; STRING_CONSTANT( Name, "PatchInstance" ); @@ -1358,9 +1358,9 @@ PatchInstance( const scene::Path& path, scene::Instance* parent, Patch& patch ) Instance::setTransformChangedCallback( LightsChangedCaller( *this ) ); } ~PatchInstance(){ - Instance::setTransformChangedCallback( Callback() ); + Instance::setTransformChangedCallback( Callback() ); - m_patch.m_lightsChanged = Callback(); + m_patch.m_lightsChanged = Callback(); GlobalShaderCache().detach( *this ); m_patch.detach( this ); @@ -1373,13 +1373,13 @@ void selectedChanged( const Selectable& selectable ){ Instance::selectedChanged(); } -typedef MemberCaller1 SelectedChangedCaller; +typedef MemberCaller SelectedChangedCaller; void selectedChangedComponent( const Selectable& selectable ){ GlobalSelectionSystem().getObserver ( SelectionSystem::eComponent )( selectable ); GlobalSelectionSystem().onComponentSelection( *this, selectable ); } -typedef MemberCaller1 SelectedChangedComponentCaller; +typedef MemberCaller SelectedChangedComponentCaller; Patch& getPatch(){ return m_patch; @@ -1612,7 +1612,7 @@ void applyTransform(){ evaluateTransform(); m_patch.freezeTransform(); } -typedef MemberCaller ApplyTransformCaller; +typedef MemberCaller ApplyTransformCaller; bool testLight( const RendererLight& light ) const {