Merge commit '173f350be76237a7dee9c00c389dff4e56b3da4c' into garux-merge

[xonotic/netradiant.git] / plugins / entity / light.cpp

diff --git a/plugins/entity/light.cpp b/plugins/entity/light.cpp
index 65ac614e25ad1aa3b6bb8dfd457f084cda3b0331..890d2e8cd33e49e58a0d660bf0f47063750da519 100644 (file)
--- a/plugins/entity/light.cpp
+++ b/plugins/entity/light.cpp
@@ -655,11 +655,11 @@ void render( RenderStateFlags state ) const {
        aabb_draw_wire( points );
 }
 };
-
+/*
 inline void default_extents( Vector3& extents ){
        extents = Vector3( 12, 12, 12 );
 }
-
+*/
 class ShaderRef
 {
 CopiedString m_name;
@@ -773,6 +773,8 @@ Doom3GroupOrigin m_funcStaticOrigin;
 LightRadii m_radii;
 Doom3LightRadius m_doom3Radius;
 
+AABB m_aabb_light;
+
 RenderLightRadiiWire m_radii_wire;
 RenderLightRadiiFill m_radii_fill;
 RenderLightRadiiBox m_radii_box;
@@ -805,16 +807,14 @@ RenderLightProjection m_renderProjection;
 
 LightShader m_shader;
 
-AABB m_aabb_light;
-
 Callback<void()> m_transformChanged;
 Callback<void()> m_boundsChanged;
 Callback<void()> m_evaluateTransform;
 
 void construct(){
        default_rotation( m_rotation );
-       m_aabb_light.origin = Vector3( 0, 0, 0 );
-       default_extents( m_aabb_light.extents );
+       //m_aabb_light.origin = Vector3( 0, 0, 0 );
+       //default_extents( m_aabb_light.extents );
 
        m_keyObservers.insert( "classname", ClassnameFilter::ClassnameChangedCaller( m_filter ) );
        m_keyObservers.insert( Static<KeyIsName>::instance().m_nameKey, NamedEntity::IdentifierChangedCaller( m_named ) );
@@ -982,6 +982,7 @@ Light( EntityClass* eclass, scene::Node& node, const Callback<void()>& transform
        m_nameKeys( m_entity ),
        m_funcStaticOrigin( m_traverse, m_originKey.m_origin ),
        m_doom3Radius( EntityClass_valueForKey( m_entity.getEntityClass(), "light_radius" ) ),
+       m_aabb_light( Vector3( 0, 0, 0 ), Vector3( 12, 12, 12 ) ),
        m_radii_wire( m_radii, m_aabb_light.origin ),
        m_radii_fill( m_radii, m_aabb_light.origin ),
        m_radii_box( m_aabb_light.origin ),
@@ -1005,6 +1006,7 @@ Light( const Light& other, scene::Node& node, const Callback<void()>& transformC
        m_nameKeys( m_entity ),
        m_funcStaticOrigin( m_traverse, m_originKey.m_origin ),
        m_doom3Radius( EntityClass_valueForKey( m_entity.getEntityClass(), "light_radius" ) ),
+       m_aabb_light( Vector3( 0, 0, 0 ), Vector3( 12, 12, 12 ) ),
        m_radii_wire( m_radii, m_aabb_light.origin ),
        m_radii_fill( m_radii, m_aabb_light.origin ),
        m_radii_box( m_aabb_light.origin ),