indent classes, align by spaces
This commit is contained in:
Garux
@@ -61,199 +61,199 @@ class GenericEntity :
|
||||
public Bounded,
|
||||
public Snappable
|
||||
{
|
||||
EntityKeyValues m_entity;
|
||||
KeyObserverMap m_keyObservers;
|
||||
MatrixTransform m_transform;
|
||||
EntityKeyValues m_entity;
|
||||
KeyObserverMap m_keyObservers;
|
||||
MatrixTransform m_transform;
|
||||
|
||||
OriginKey m_originKey;
|
||||
Vector3 m_origin;
|
||||
AnglesKey m_anglesKey;
|
||||
Vector3 m_angles;
|
||||
OriginKey m_originKey;
|
||||
Vector3 m_origin;
|
||||
AnglesKey m_anglesKey;
|
||||
Vector3 m_angles;
|
||||
|
||||
ClassnameFilter m_filter;
|
||||
NamedEntity m_named;
|
||||
NameKeys m_nameKeys;
|
||||
ClassnameFilter m_filter;
|
||||
NamedEntity m_named;
|
||||
NameKeys m_nameKeys;
|
||||
|
||||
AABB m_aabb_local;
|
||||
AABB m_aabb_local;
|
||||
|
||||
RenderableArrow m_arrow;
|
||||
RenderableSolidAABB m_aabb_solid;
|
||||
RenderableWireframeAABB m_aabb_wire;
|
||||
RenderableNamedEntity m_renderName;
|
||||
RenderableArrow m_arrow;
|
||||
RenderableSolidAABB m_aabb_solid;
|
||||
RenderableWireframeAABB m_aabb_wire;
|
||||
RenderableNamedEntity m_renderName;
|
||||
|
||||
Callback m_transformChanged;
|
||||
Callback m_evaluateTransform;
|
||||
Callback m_transformChanged;
|
||||
Callback m_evaluateTransform;
|
||||
|
||||
void construct(){
|
||||
read_aabb( m_aabb_local, m_entity.getEntityClass() );
|
||||
void construct(){
|
||||
read_aabb( m_aabb_local, m_entity.getEntityClass() );
|
||||
|
||||
m_keyObservers.insert( "classname", ClassnameFilter::ClassnameChangedCaller( m_filter ) );
|
||||
m_keyObservers.insert( Static<KeyIsName>::instance().m_nameKey, NamedEntity::IdentifierChangedCaller( m_named ) );
|
||||
m_keyObservers.insert( "angle", AnglesKey::AngleChangedCaller( m_anglesKey ) );
|
||||
m_keyObservers.insert( "angles", AnglesKey::AnglesChangedCaller( m_anglesKey ) );
|
||||
m_keyObservers.insert( "origin", OriginKey::OriginChangedCaller( m_originKey ) );
|
||||
}
|
||||
m_keyObservers.insert( "classname", ClassnameFilter::ClassnameChangedCaller( m_filter ) );
|
||||
m_keyObservers.insert( Static<KeyIsName>::instance().m_nameKey, NamedEntity::IdentifierChangedCaller( m_named ) );
|
||||
m_keyObservers.insert( "angle", AnglesKey::AngleChangedCaller( m_anglesKey ) );
|
||||
m_keyObservers.insert( "angles", AnglesKey::AnglesChangedCaller( m_anglesKey ) );
|
||||
m_keyObservers.insert( "origin", OriginKey::OriginChangedCaller( m_originKey ) );
|
||||
}
|
||||
|
||||
// vc 2k5 compiler fix
|
||||
#if _MSC_VER >= 1400
|
||||
public:
|
||||
#endif
|
||||
|
||||
void updateTransform(){
|
||||
m_transform.localToParent() = g_matrix4_identity;
|
||||
matrix4_translate_by_vec3( m_transform.localToParent(), m_origin );
|
||||
m_transformChanged();
|
||||
}
|
||||
typedef MemberCaller<GenericEntity, &GenericEntity::updateTransform> UpdateTransformCaller;
|
||||
void originChanged(){
|
||||
m_origin = m_originKey.m_origin;
|
||||
updateTransform();
|
||||
}
|
||||
typedef MemberCaller<GenericEntity, &GenericEntity::originChanged> OriginChangedCaller;
|
||||
void anglesChanged(){
|
||||
m_angles = m_anglesKey.m_angles;
|
||||
updateTransform();
|
||||
}
|
||||
typedef MemberCaller<GenericEntity, &GenericEntity::anglesChanged> AnglesChangedCaller;
|
||||
void updateTransform(){
|
||||
m_transform.localToParent() = g_matrix4_identity;
|
||||
matrix4_translate_by_vec3( m_transform.localToParent(), m_origin );
|
||||
m_transformChanged();
|
||||
}
|
||||
typedef MemberCaller<GenericEntity, &GenericEntity::updateTransform> UpdateTransformCaller;
|
||||
void originChanged(){
|
||||
m_origin = m_originKey.m_origin;
|
||||
updateTransform();
|
||||
}
|
||||
typedef MemberCaller<GenericEntity, &GenericEntity::originChanged> OriginChangedCaller;
|
||||
void anglesChanged(){
|
||||
m_angles = m_anglesKey.m_angles;
|
||||
updateTransform();
|
||||
}
|
||||
typedef MemberCaller<GenericEntity, &GenericEntity::anglesChanged> AnglesChangedCaller;
|
||||
public:
|
||||
|
||||
GenericEntity( EntityClass* eclass, scene::Node& node, const Callback& transformChanged, const Callback& evaluateTransform ) :
|
||||
m_entity( eclass ),
|
||||
m_originKey( OriginChangedCaller( *this ) ),
|
||||
m_origin( ORIGINKEY_IDENTITY ),
|
||||
m_anglesKey( AnglesChangedCaller( *this ) ),
|
||||
m_angles( ANGLESKEY_IDENTITY ),
|
||||
m_filter( m_entity, node ),
|
||||
m_named( m_entity ),
|
||||
m_nameKeys( m_entity ),
|
||||
m_arrow( m_aabb_local.origin, m_angles ),
|
||||
m_aabb_solid( m_aabb_local ),
|
||||
m_aabb_wire( m_aabb_local ),
|
||||
m_renderName( m_named, g_vector3_identity ),
|
||||
m_transformChanged( transformChanged ),
|
||||
m_evaluateTransform( evaluateTransform ){
|
||||
construct();
|
||||
}
|
||||
GenericEntity( const GenericEntity& other, scene::Node& node, const Callback& transformChanged, const Callback& evaluateTransform ) :
|
||||
m_entity( other.m_entity ),
|
||||
m_originKey( OriginChangedCaller( *this ) ),
|
||||
m_origin( ORIGINKEY_IDENTITY ),
|
||||
m_anglesKey( AnglesChangedCaller( *this ) ),
|
||||
m_angles( ANGLESKEY_IDENTITY ),
|
||||
m_filter( m_entity, node ),
|
||||
m_named( m_entity ),
|
||||
m_nameKeys( m_entity ),
|
||||
m_arrow( m_aabb_local.origin, m_angles ),
|
||||
m_aabb_solid( m_aabb_local ),
|
||||
m_aabb_wire( m_aabb_local ),
|
||||
m_renderName( m_named, g_vector3_identity ),
|
||||
m_transformChanged( transformChanged ),
|
||||
m_evaluateTransform( evaluateTransform ){
|
||||
construct();
|
||||
}
|
||||
|
||||
InstanceCounter m_instanceCounter;
|
||||
void instanceAttach( const scene::Path& path ){
|
||||
if ( ++m_instanceCounter.m_count == 1 ) {
|
||||
m_filter.instanceAttach();
|
||||
m_entity.instanceAttach( path_find_mapfile( path.begin(), path.end() ) );
|
||||
m_entity.attach( m_keyObservers );
|
||||
GenericEntity( EntityClass* eclass, scene::Node& node, const Callback& transformChanged, const Callback& evaluateTransform ) :
|
||||
m_entity( eclass ),
|
||||
m_originKey( OriginChangedCaller( *this ) ),
|
||||
m_origin( ORIGINKEY_IDENTITY ),
|
||||
m_anglesKey( AnglesChangedCaller( *this ) ),
|
||||
m_angles( ANGLESKEY_IDENTITY ),
|
||||
m_filter( m_entity, node ),
|
||||
m_named( m_entity ),
|
||||
m_nameKeys( m_entity ),
|
||||
m_arrow( m_aabb_local.origin, m_angles ),
|
||||
m_aabb_solid( m_aabb_local ),
|
||||
m_aabb_wire( m_aabb_local ),
|
||||
m_renderName( m_named, g_vector3_identity ),
|
||||
m_transformChanged( transformChanged ),
|
||||
m_evaluateTransform( evaluateTransform ){
|
||||
construct();
|
||||
}
|
||||
}
|
||||
void instanceDetach( const scene::Path& path ){
|
||||
if ( --m_instanceCounter.m_count == 0 ) {
|
||||
m_entity.detach( m_keyObservers );
|
||||
m_entity.instanceDetach( path_find_mapfile( path.begin(), path.end() ) );
|
||||
m_filter.instanceDetach();
|
||||
GenericEntity( const GenericEntity& other, scene::Node& node, const Callback& transformChanged, const Callback& evaluateTransform ) :
|
||||
m_entity( other.m_entity ),
|
||||
m_originKey( OriginChangedCaller( *this ) ),
|
||||
m_origin( ORIGINKEY_IDENTITY ),
|
||||
m_anglesKey( AnglesChangedCaller( *this ) ),
|
||||
m_angles( ANGLESKEY_IDENTITY ),
|
||||
m_filter( m_entity, node ),
|
||||
m_named( m_entity ),
|
||||
m_nameKeys( m_entity ),
|
||||
m_arrow( m_aabb_local.origin, m_angles ),
|
||||
m_aabb_solid( m_aabb_local ),
|
||||
m_aabb_wire( m_aabb_local ),
|
||||
m_renderName( m_named, g_vector3_identity ),
|
||||
m_transformChanged( transformChanged ),
|
||||
m_evaluateTransform( evaluateTransform ){
|
||||
construct();
|
||||
}
|
||||
}
|
||||
|
||||
EntityKeyValues& getEntity(){
|
||||
return m_entity;
|
||||
}
|
||||
const EntityKeyValues& getEntity() const {
|
||||
return m_entity;
|
||||
}
|
||||
|
||||
Namespaced& getNamespaced(){
|
||||
return m_nameKeys;
|
||||
}
|
||||
Nameable& getNameable(){
|
||||
return m_named;
|
||||
}
|
||||
TransformNode& getTransformNode(){
|
||||
return m_transform;
|
||||
}
|
||||
|
||||
const AABB& localAABB() const {
|
||||
return m_aabb_local;
|
||||
}
|
||||
|
||||
VolumeIntersectionValue intersectVolume( const VolumeTest& volume, const Matrix4& localToWorld ) const {
|
||||
return volume.TestAABB( localAABB(), localToWorld );
|
||||
}
|
||||
|
||||
void renderArrow( Renderer& renderer, const VolumeTest& volume, const Matrix4& localToWorld ) const {
|
||||
if ( g_showAngles ) {
|
||||
renderer.addRenderable( m_arrow, localToWorld );
|
||||
InstanceCounter m_instanceCounter;
|
||||
void instanceAttach( const scene::Path& path ){
|
||||
if ( ++m_instanceCounter.m_count == 1 ) {
|
||||
m_filter.instanceAttach();
|
||||
m_entity.instanceAttach( path_find_mapfile( path.begin(), path.end() ) );
|
||||
m_entity.attach( m_keyObservers );
|
||||
}
|
||||
}
|
||||
}
|
||||
void renderSolid( Renderer& renderer, const VolumeTest& volume, const Matrix4& localToWorld, bool selected ) const {
|
||||
renderer.SetState( m_entity.getEntityClass().m_state_fill, Renderer::eFullMaterials );
|
||||
renderer.addRenderable( m_aabb_solid, localToWorld );
|
||||
renderArrow( renderer, volume, localToWorld );
|
||||
if ( g_showNames || selected ) {
|
||||
m_renderName.render( renderer, volume, localToWorld, selected );
|
||||
void instanceDetach( const scene::Path& path ){
|
||||
if ( --m_instanceCounter.m_count == 0 ) {
|
||||
m_entity.detach( m_keyObservers );
|
||||
m_entity.instanceDetach( path_find_mapfile( path.begin(), path.end() ) );
|
||||
m_filter.instanceDetach();
|
||||
}
|
||||
}
|
||||
}
|
||||
void renderWireframe( Renderer& renderer, const VolumeTest& volume, const Matrix4& localToWorld, bool selected ) const {
|
||||
renderer.SetState( m_entity.getEntityClass().m_state_wire, Renderer::eWireframeOnly );
|
||||
renderer.addRenderable( m_aabb_wire, localToWorld );
|
||||
renderArrow( renderer, volume, localToWorld );
|
||||
if ( selected || ( g_showNames && aabb_fits_view( m_aabb_local, volume.GetModelview(), volume.GetViewport(), g_showNamesRatio ) ) ) {
|
||||
m_renderName.render( renderer, volume, localToWorld, selected );
|
||||
|
||||
EntityKeyValues& getEntity(){
|
||||
return m_entity;
|
||||
}
|
||||
const EntityKeyValues& getEntity() const {
|
||||
return m_entity;
|
||||
}
|
||||
|
||||
Namespaced& getNamespaced(){
|
||||
return m_nameKeys;
|
||||
}
|
||||
Nameable& getNameable(){
|
||||
return m_named;
|
||||
}
|
||||
TransformNode& getTransformNode(){
|
||||
return m_transform;
|
||||
}
|
||||
|
||||
const AABB& localAABB() const {
|
||||
return m_aabb_local;
|
||||
}
|
||||
|
||||
VolumeIntersectionValue intersectVolume( const VolumeTest& volume, const Matrix4& localToWorld ) const {
|
||||
return volume.TestAABB( localAABB(), localToWorld );
|
||||
}
|
||||
|
||||
void renderArrow( Renderer& renderer, const VolumeTest& volume, const Matrix4& localToWorld ) const {
|
||||
if ( g_showAngles ) {
|
||||
renderer.addRenderable( m_arrow, localToWorld );
|
||||
}
|
||||
}
|
||||
void renderSolid( Renderer& renderer, const VolumeTest& volume, const Matrix4& localToWorld, bool selected ) const {
|
||||
renderer.SetState( m_entity.getEntityClass().m_state_fill, Renderer::eFullMaterials );
|
||||
renderer.addRenderable( m_aabb_solid, localToWorld );
|
||||
renderArrow( renderer, volume, localToWorld );
|
||||
if ( g_showNames || selected ) {
|
||||
m_renderName.render( renderer, volume, localToWorld, selected );
|
||||
}
|
||||
}
|
||||
void renderWireframe( Renderer& renderer, const VolumeTest& volume, const Matrix4& localToWorld, bool selected ) const {
|
||||
renderer.SetState( m_entity.getEntityClass().m_state_wire, Renderer::eWireframeOnly );
|
||||
renderer.addRenderable( m_aabb_wire, localToWorld );
|
||||
renderArrow( renderer, volume, localToWorld );
|
||||
if ( selected || ( g_showNames && aabb_fits_view( m_aabb_local, volume.GetModelview(), volume.GetViewport(), g_showNamesRatio ) ) ) {
|
||||
m_renderName.render( renderer, volume, localToWorld, selected );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void testSelect( Selector& selector, SelectionTest& test, const Matrix4& localToWorld ){
|
||||
test.BeginMesh( localToWorld );
|
||||
void testSelect( Selector& selector, SelectionTest& test, const Matrix4& localToWorld ){
|
||||
test.BeginMesh( localToWorld );
|
||||
|
||||
SelectionIntersection best;
|
||||
aabb_testselect( m_aabb_local, test, best );
|
||||
if ( best.valid() ) {
|
||||
selector.addIntersection( best );
|
||||
SelectionIntersection best;
|
||||
aabb_testselect( m_aabb_local, test, best );
|
||||
if ( best.valid() ) {
|
||||
selector.addIntersection( best );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void translate( const Vector3& translation ){
|
||||
m_origin = origin_translated( m_origin, translation );
|
||||
}
|
||||
void rotate( const Quaternion& rotation ){
|
||||
m_angles = angles_rotated( m_angles, rotation );
|
||||
}
|
||||
void snapto( float snap ){
|
||||
m_originKey.m_origin = origin_snapped( m_originKey.m_origin, snap );
|
||||
m_originKey.write( &m_entity );
|
||||
}
|
||||
void revertTransform(){
|
||||
m_origin = m_originKey.m_origin;
|
||||
m_angles = m_anglesKey.m_angles;
|
||||
}
|
||||
void freezeTransform(){
|
||||
m_originKey.m_origin = m_origin;
|
||||
m_originKey.write( &m_entity );
|
||||
if( m_anglesKey.m_angles != m_angles ){
|
||||
m_anglesKey.m_angles = m_angles;
|
||||
m_anglesKey.write( &m_entity );
|
||||
void translate( const Vector3& translation ){
|
||||
m_origin = origin_translated( m_origin, translation );
|
||||
}
|
||||
}
|
||||
void transformChanged(){
|
||||
revertTransform();
|
||||
m_evaluateTransform();
|
||||
updateTransform();
|
||||
}
|
||||
typedef MemberCaller<GenericEntity, &GenericEntity::transformChanged> TransformChangedCaller;
|
||||
void rotate( const Quaternion& rotation ){
|
||||
m_angles = angles_rotated( m_angles, rotation );
|
||||
}
|
||||
void snapto( float snap ){
|
||||
m_originKey.m_origin = origin_snapped( m_originKey.m_origin, snap );
|
||||
m_originKey.write( &m_entity );
|
||||
}
|
||||
void revertTransform(){
|
||||
m_origin = m_originKey.m_origin;
|
||||
m_angles = m_anglesKey.m_angles;
|
||||
}
|
||||
void freezeTransform(){
|
||||
m_originKey.m_origin = m_origin;
|
||||
m_originKey.write( &m_entity );
|
||||
if( m_anglesKey.m_angles != m_angles ){
|
||||
m_anglesKey.m_angles = m_angles;
|
||||
m_anglesKey.write( &m_entity );
|
||||
}
|
||||
}
|
||||
void transformChanged(){
|
||||
revertTransform();
|
||||
m_evaluateTransform();
|
||||
updateTransform();
|
||||
}
|
||||
typedef MemberCaller<GenericEntity, &GenericEntity::transformChanged> TransformChangedCaller;
|
||||
};
|
||||
|
||||
class GenericEntityInstance :
|
||||
@@ -262,78 +262,78 @@ class GenericEntityInstance :
|
||||
public Renderable,
|
||||
public SelectionTestable
|
||||
{
|
||||
class TypeCasts
|
||||
{
|
||||
InstanceTypeCastTable m_casts;
|
||||
public:
|
||||
TypeCasts(){
|
||||
m_casts = TargetableInstance::StaticTypeCasts::instance().get();
|
||||
InstanceContainedCast<GenericEntityInstance, Bounded>::install( m_casts );
|
||||
InstanceContainedCast<GenericEntityInstance, Cullable>::install( m_casts );
|
||||
InstanceStaticCast<GenericEntityInstance, Renderable>::install( m_casts );
|
||||
InstanceStaticCast<GenericEntityInstance, SelectionTestable>::install( m_casts );
|
||||
InstanceStaticCast<GenericEntityInstance, Transformable>::install( m_casts );
|
||||
InstanceIdentityCast<GenericEntityInstance>::install( m_casts );
|
||||
}
|
||||
InstanceTypeCastTable& get(){
|
||||
return m_casts;
|
||||
}
|
||||
};
|
||||
class TypeCasts
|
||||
{
|
||||
InstanceTypeCastTable m_casts;
|
||||
public:
|
||||
TypeCasts(){
|
||||
m_casts = TargetableInstance::StaticTypeCasts::instance().get();
|
||||
InstanceContainedCast<GenericEntityInstance, Bounded>::install( m_casts );
|
||||
InstanceContainedCast<GenericEntityInstance, Cullable>::install( m_casts );
|
||||
InstanceStaticCast<GenericEntityInstance, Renderable>::install( m_casts );
|
||||
InstanceStaticCast<GenericEntityInstance, SelectionTestable>::install( m_casts );
|
||||
InstanceStaticCast<GenericEntityInstance, Transformable>::install( m_casts );
|
||||
InstanceIdentityCast<GenericEntityInstance>::install( m_casts );
|
||||
}
|
||||
InstanceTypeCastTable& get(){
|
||||
return m_casts;
|
||||
}
|
||||
};
|
||||
|
||||
GenericEntity& m_contained;
|
||||
mutable AABB m_bounds;
|
||||
GenericEntity& m_contained;
|
||||
mutable AABB m_bounds;
|
||||
public:
|
||||
|
||||
typedef LazyStatic<TypeCasts> StaticTypeCasts;
|
||||
typedef LazyStatic<TypeCasts> StaticTypeCasts;
|
||||
|
||||
Bounded& get( NullType<Bounded>){
|
||||
return m_contained;
|
||||
}
|
||||
Cullable& get( NullType<Cullable>){
|
||||
return m_contained;
|
||||
}
|
||||
Bounded& get( NullType<Bounded>){
|
||||
return m_contained;
|
||||
}
|
||||
Cullable& get( NullType<Cullable>){
|
||||
return m_contained;
|
||||
}
|
||||
|
||||
STRING_CONSTANT( Name, "GenericEntityInstance" );
|
||||
STRING_CONSTANT( Name, "GenericEntityInstance" );
|
||||
|
||||
GenericEntityInstance( const scene::Path& path, scene::Instance* parent, GenericEntity& contained ) :
|
||||
TargetableInstance( path, parent, this, StaticTypeCasts::instance().get(), contained.getEntity(), *this ),
|
||||
TransformModifier( GenericEntity::TransformChangedCaller( contained ), ApplyTransformCaller( *this ) ),
|
||||
m_contained( contained ){
|
||||
m_contained.instanceAttach( Instance::path() );
|
||||
GenericEntityInstance( const scene::Path& path, scene::Instance* parent, GenericEntity& contained ) :
|
||||
TargetableInstance( path, parent, this, StaticTypeCasts::instance().get(), contained.getEntity(), *this ),
|
||||
TransformModifier( GenericEntity::TransformChangedCaller( contained ), ApplyTransformCaller( *this ) ),
|
||||
m_contained( contained ){
|
||||
m_contained.instanceAttach( Instance::path() );
|
||||
|
||||
StaticRenderableConnectionLines::instance().attach( *this );
|
||||
}
|
||||
~GenericEntityInstance(){
|
||||
StaticRenderableConnectionLines::instance().detach( *this );
|
||||
StaticRenderableConnectionLines::instance().attach( *this );
|
||||
}
|
||||
~GenericEntityInstance(){
|
||||
StaticRenderableConnectionLines::instance().detach( *this );
|
||||
|
||||
m_contained.instanceDetach( Instance::path() );
|
||||
}
|
||||
m_contained.instanceDetach( Instance::path() );
|
||||
}
|
||||
|
||||
void renderSolid( Renderer& renderer, const VolumeTest& volume ) const {
|
||||
m_contained.renderSolid( renderer, volume, Instance::localToWorld(), getSelectable().isSelected() );
|
||||
}
|
||||
void renderWireframe( Renderer& renderer, const VolumeTest& volume ) const {
|
||||
m_contained.renderWireframe( renderer, volume, Instance::localToWorld(), getSelectable().isSelected() );
|
||||
}
|
||||
void renderSolid( Renderer& renderer, const VolumeTest& volume ) const {
|
||||
m_contained.renderSolid( renderer, volume, Instance::localToWorld(), getSelectable().isSelected() );
|
||||
}
|
||||
void renderWireframe( Renderer& renderer, const VolumeTest& volume ) const {
|
||||
m_contained.renderWireframe( renderer, volume, Instance::localToWorld(), getSelectable().isSelected() );
|
||||
}
|
||||
|
||||
void testSelect( Selector& selector, SelectionTest& test ){
|
||||
m_contained.testSelect( selector, test, Instance::localToWorld() );
|
||||
}
|
||||
void testSelect( Selector& selector, SelectionTest& test ){
|
||||
m_contained.testSelect( selector, test, Instance::localToWorld() );
|
||||
}
|
||||
|
||||
void evaluateTransform(){
|
||||
if ( getType() == TRANSFORM_PRIMITIVE ) {
|
||||
m_contained.translate( getTranslation() );
|
||||
if( getRotation() != c_quaternion_identity ){
|
||||
m_contained.rotate( getRotation() );
|
||||
void evaluateTransform(){
|
||||
if ( getType() == TRANSFORM_PRIMITIVE ) {
|
||||
m_contained.translate( getTranslation() );
|
||||
if( getRotation() != c_quaternion_identity ){
|
||||
m_contained.rotate( getRotation() );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
void applyTransform(){
|
||||
m_contained.revertTransform();
|
||||
evaluateTransform();
|
||||
m_contained.freezeTransform();
|
||||
}
|
||||
typedef MemberCaller<GenericEntityInstance, &GenericEntityInstance::applyTransform> ApplyTransformCaller;
|
||||
void applyTransform(){
|
||||
m_contained.revertTransform();
|
||||
evaluateTransform();
|
||||
m_contained.freezeTransform();
|
||||
}
|
||||
typedef MemberCaller<GenericEntityInstance, &GenericEntityInstance::applyTransform> ApplyTransformCaller;
|
||||
};
|
||||
|
||||
class GenericEntityNode :
|
||||
@@ -341,83 +341,83 @@ class GenericEntityNode :
|
||||
public scene::Instantiable,
|
||||
public scene::Cloneable
|
||||
{
|
||||
class TypeCasts
|
||||
{
|
||||
NodeTypeCastTable m_casts;
|
||||
public:
|
||||
TypeCasts(){
|
||||
NodeStaticCast<GenericEntityNode, scene::Instantiable>::install( m_casts );
|
||||
NodeStaticCast<GenericEntityNode, scene::Cloneable>::install( m_casts );
|
||||
NodeContainedCast<GenericEntityNode, Snappable>::install( m_casts );
|
||||
NodeContainedCast<GenericEntityNode, TransformNode>::install( m_casts );
|
||||
NodeContainedCast<GenericEntityNode, Entity>::install( m_casts );
|
||||
NodeContainedCast<GenericEntityNode, Nameable>::install( m_casts );
|
||||
NodeContainedCast<GenericEntityNode, Namespaced>::install( m_casts );
|
||||
}
|
||||
NodeTypeCastTable& get(){
|
||||
return m_casts;
|
||||
}
|
||||
};
|
||||
class TypeCasts
|
||||
{
|
||||
NodeTypeCastTable m_casts;
|
||||
public:
|
||||
TypeCasts(){
|
||||
NodeStaticCast<GenericEntityNode, scene::Instantiable>::install( m_casts );
|
||||
NodeStaticCast<GenericEntityNode, scene::Cloneable>::install( m_casts );
|
||||
NodeContainedCast<GenericEntityNode, Snappable>::install( m_casts );
|
||||
NodeContainedCast<GenericEntityNode, TransformNode>::install( m_casts );
|
||||
NodeContainedCast<GenericEntityNode, Entity>::install( m_casts );
|
||||
NodeContainedCast<GenericEntityNode, Nameable>::install( m_casts );
|
||||
NodeContainedCast<GenericEntityNode, Namespaced>::install( m_casts );
|
||||
}
|
||||
NodeTypeCastTable& get(){
|
||||
return m_casts;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
InstanceSet m_instances;
|
||||
InstanceSet m_instances;
|
||||
|
||||
scene::Node m_node;
|
||||
GenericEntity m_contained;
|
||||
scene::Node m_node;
|
||||
GenericEntity m_contained;
|
||||
|
||||
public:
|
||||
typedef LazyStatic<TypeCasts> StaticTypeCasts;
|
||||
typedef LazyStatic<TypeCasts> StaticTypeCasts;
|
||||
|
||||
Snappable& get( NullType<Snappable>){
|
||||
return m_contained;
|
||||
}
|
||||
TransformNode& get( NullType<TransformNode>){
|
||||
return m_contained.getTransformNode();
|
||||
}
|
||||
Entity& get( NullType<Entity>){
|
||||
return m_contained.getEntity();
|
||||
}
|
||||
Nameable& get( NullType<Nameable>){
|
||||
return m_contained.getNameable();
|
||||
}
|
||||
Namespaced& get( NullType<Namespaced>){
|
||||
return m_contained.getNamespaced();
|
||||
}
|
||||
Snappable& get( NullType<Snappable>){
|
||||
return m_contained;
|
||||
}
|
||||
TransformNode& get( NullType<TransformNode>){
|
||||
return m_contained.getTransformNode();
|
||||
}
|
||||
Entity& get( NullType<Entity>){
|
||||
return m_contained.getEntity();
|
||||
}
|
||||
Nameable& get( NullType<Nameable>){
|
||||
return m_contained.getNameable();
|
||||
}
|
||||
Namespaced& get( NullType<Namespaced>){
|
||||
return m_contained.getNamespaced();
|
||||
}
|
||||
|
||||
GenericEntityNode( EntityClass* eclass ) :
|
||||
m_node( this, this, StaticTypeCasts::instance().get() ),
|
||||
m_contained( eclass, m_node, InstanceSet::TransformChangedCaller( m_instances ), InstanceSetEvaluateTransform<GenericEntityInstance>::Caller( m_instances ) ){
|
||||
}
|
||||
GenericEntityNode( const GenericEntityNode& other ) :
|
||||
scene::Node::Symbiot( other ),
|
||||
scene::Instantiable( other ),
|
||||
scene::Cloneable( other ),
|
||||
m_node( this, this, StaticTypeCasts::instance().get() ),
|
||||
m_contained( other.m_contained, m_node, InstanceSet::TransformChangedCaller( m_instances ), InstanceSetEvaluateTransform<GenericEntityInstance>::Caller( m_instances ) ){
|
||||
}
|
||||
void release(){
|
||||
delete this;
|
||||
}
|
||||
scene::Node& node(){
|
||||
return m_node;
|
||||
}
|
||||
GenericEntityNode( EntityClass* eclass ) :
|
||||
m_node( this, this, StaticTypeCasts::instance().get() ),
|
||||
m_contained( eclass, m_node, InstanceSet::TransformChangedCaller( m_instances ), InstanceSetEvaluateTransform<GenericEntityInstance>::Caller( m_instances ) ){
|
||||
}
|
||||
GenericEntityNode( const GenericEntityNode& other ) :
|
||||
scene::Node::Symbiot( other ),
|
||||
scene::Instantiable( other ),
|
||||
scene::Cloneable( other ),
|
||||
m_node( this, this, StaticTypeCasts::instance().get() ),
|
||||
m_contained( other.m_contained, m_node, InstanceSet::TransformChangedCaller( m_instances ), InstanceSetEvaluateTransform<GenericEntityInstance>::Caller( m_instances ) ){
|
||||
}
|
||||
void release(){
|
||||
delete this;
|
||||
}
|
||||
scene::Node& node(){
|
||||
return m_node;
|
||||
}
|
||||
|
||||
scene::Node& clone() const {
|
||||
return ( new GenericEntityNode( *this ) )->node();
|
||||
}
|
||||
scene::Node& clone() const {
|
||||
return ( new GenericEntityNode( *this ) )->node();
|
||||
}
|
||||
|
||||
scene::Instance* create( const scene::Path& path, scene::Instance* parent ){
|
||||
return new GenericEntityInstance( path, parent, m_contained );
|
||||
}
|
||||
void forEachInstance( const scene::Instantiable::Visitor& visitor ){
|
||||
m_instances.forEachInstance( visitor );
|
||||
}
|
||||
void insert( scene::Instantiable::Observer* observer, const scene::Path& path, scene::Instance* instance ){
|
||||
m_instances.insert( observer, path, instance );
|
||||
}
|
||||
scene::Instance* erase( scene::Instantiable::Observer* observer, const scene::Path& path ){
|
||||
return m_instances.erase( observer, path );
|
||||
}
|
||||
scene::Instance* create( const scene::Path& path, scene::Instance* parent ){
|
||||
return new GenericEntityInstance( path, parent, m_contained );
|
||||
}
|
||||
void forEachInstance( const scene::Instantiable::Visitor& visitor ){
|
||||
m_instances.forEachInstance( visitor );
|
||||
}
|
||||
void insert( scene::Instantiable::Observer* observer, const scene::Path& path, scene::Instance* instance ){
|
||||
m_instances.insert( observer, path, instance );
|
||||
}
|
||||
scene::Instance* erase( scene::Instantiable::Observer* observer, const scene::Path& path ){
|
||||
return m_instances.erase( observer, path );
|
||||
}
|
||||
};
|
||||
|
||||
scene::Node& New_GenericEntity( EntityClass* eclass ){
|
||||
|
||||
Reference in New Issue
Block a user