SingletonModel m_model;
OriginKey m_originKey;
Vector3 m_origin;
+
RotationKey m_rotationKey;
Float9 m_rotation;
Doom3GroupOrigin m_funcStaticOrigin;
RenderablePivot m_renderOrigin;
RenderableNamedEntity m_renderName;
+ mutable Vector3 m_name_origin;
ModelSkinKey m_skin;
public:
setIsModel(!string_equal(m_modelKey.c_str(), m_name.c_str()));
}
+// vc 2k5 compiler fix
+#if _MSC_VER >= 1400
+ public:
+#endif
+
void nameChanged(const char* value)
{
m_name = value;
m_named(m_entity),
m_nameKeys(m_entity),
m_funcStaticOrigin(m_traverse, m_origin),
- m_renderName(m_named, g_vector3_identity),
+ m_renderName(m_named, m_name_origin),
+ m_name_origin(g_vector3_identity),
m_skin(SkinChangedCaller(*this)),
m_curveNURBS(boundsChanged),
m_curveCatmullRom(boundsChanged),
renderer.addRenderable(m_curveCatmullRom.m_renderCurve, localToWorld);
}
}
- void renderWireframe(Renderer& renderer, const VolumeTest& volume, const Matrix4& localToWorld, bool selected) const
+
+ void renderWireframe(Renderer& renderer, const VolumeTest& volume, const Matrix4& localToWorld, bool selected, const AABB& childBounds) const
{
renderSolid(renderer, volume, localToWorld, selected);
- if(g_showNames && isModel())
+
+ if(g_showNames)
{
+ // draw models as usual
+ if(!isModel())
+ {
+ // don't draw the name for worldspawn
+ if(!strcmp(m_entity.getEntityClass().name(), "worldspawn"))
+ return;
+
+ // place name in the middle of the "children cloud"
+ m_name_origin = childBounds.origin;
+ }
+
renderer.addRenderable(m_renderName, localToWorld);
}
}
}
void renderWireframe(Renderer& renderer, const VolumeTest& volume) const
{
- m_contained.renderWireframe(renderer, volume, Instance::localToWorld(), getSelectable().isSelected());
+ m_contained.renderWireframe(renderer, volume, Instance::localToWorld(), getSelectable().isSelected(), Instance::childBounds());
m_curveNURBS.renderComponentsSelected(renderer, volume, localToWorld());
m_curveCatmullRom.renderComponentsSelected(renderer, volume, localToWorld());