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

Q3map2:

Browse Source 
* fix crash with nonpthreads xmllib + multithreading + output to system console
	* number of code fixes
Radiant:

misc...
	* fix: clone group ent / map import / saving map as : group ents name labels at 0,0,0;
	* number of code fixes
This commit is contained in:
Garux
2017-08-02 09:00:11 +03:00
parent 3ec33465b1
commit 173f350be7
29 changed files with 101 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/entity/light.cpp
View File

@@ -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 m_transformChanged;
Callback m_boundsChanged;
Callback 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& transformChanged,
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& transformChanged,
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 ),