mirror of
https://github.com/UberGames/GtkRadiant.git
synced 2025-02-21 11:21:58 +00:00
Fixed unnecessary warnings, see http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=1108 for details
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@104 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
parent
c9fe7c0498
commit
8a61657fc4
5 changed files with 23 additions and 16 deletions
5
CHANGES
5
CHANGES
|
@ -1,6 +1,11 @@
|
||||||
This is the changelog for developers, != changelog for the end user
|
This is the changelog for developers, != changelog for the end user
|
||||||
that we distribute with the binaries. (see changelog)
|
that we distribute with the binaries. (see changelog)
|
||||||
|
|
||||||
|
11/09/2006
|
||||||
|
namespace
|
||||||
|
- Fixed unnecessary warnings, see http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=1108
|
||||||
|
for details
|
||||||
|
|
||||||
11/09/2006
|
11/09/2006
|
||||||
namespace
|
namespace
|
||||||
- Added sunplug (Mapcoordinator-plugin for ET) by Topsun
|
- Added sunplug (Mapcoordinator-plugin for ET) by Topsun
|
||||||
|
|
|
@ -83,7 +83,7 @@ public:
|
||||||
class _QERFaceData
|
class _QERFaceData
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
_QERFaceData() : contents(0), flags(0), value(0), m_shader("")
|
_QERFaceData() : m_shader(""), contents(0), flags(0), value(0)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
Vector3 m_p0;
|
Vector3 m_p0;
|
||||||
|
|
|
@ -574,17 +574,17 @@ inline Matrix4 matrix4_affine_inverse(const Matrix4& self)
|
||||||
// invert rotation submatrix
|
// invert rotation submatrix
|
||||||
det = 1.0 / det;
|
det = 1.0 / det;
|
||||||
|
|
||||||
result[0] = ( (self[5]*self[10]- self[6]*self[9] )*det);
|
result[0] = static_cast<float>( (self[5]*self[10]- self[6]*self[9] )*det);
|
||||||
result[1] = (- (self[1]*self[10]- self[2]*self[9] )*det);
|
result[1] = static_cast<float>(- (self[1]*self[10]- self[2]*self[9] )*det);
|
||||||
result[2] = ( (self[1]*self[6] - self[2]*self[5] )*det);
|
result[2] = static_cast<float>( (self[1]*self[6] - self[2]*self[5] )*det);
|
||||||
result[3] = 0;
|
result[3] = 0;
|
||||||
result[4] = (- (self[4]*self[10]- self[6]*self[8] )*det);
|
result[4] = static_cast<float>(- (self[4]*self[10]- self[6]*self[8] )*det);
|
||||||
result[5] = ( (self[0]*self[10]- self[2]*self[8] )*det);
|
result[5] = static_cast<float>( (self[0]*self[10]- self[2]*self[8] )*det);
|
||||||
result[6] = (- (self[0]*self[6] - self[2]*self[4] )*det);
|
result[6] = static_cast<float>(- (self[0]*self[6] - self[2]*self[4] )*det);
|
||||||
result[7] = 0;
|
result[7] = 0;
|
||||||
result[8] = ( (self[4]*self[9] - self[5]*self[8] )*det);
|
result[8] = static_cast<float>( (self[4]*self[9] - self[5]*self[8] )*det);
|
||||||
result[9] = (- (self[0]*self[9] - self[1]*self[8] )*det);
|
result[9] = static_cast<float>(- (self[0]*self[9] - self[1]*self[8] )*det);
|
||||||
result[10]= ( (self[0]*self[5] - self[1]*self[4] )*det);
|
result[10]= static_cast<float>( (self[0]*self[5] - self[1]*self[4] )*det);
|
||||||
result[11] = 0;
|
result[11] = 0;
|
||||||
|
|
||||||
// multiply translation part by rotation
|
// multiply translation part by rotation
|
||||||
|
|
|
@ -1734,10 +1734,10 @@ public:
|
||||||
m_render_faces(m_faceCentroidPoints, GL_POINTS),
|
m_render_faces(m_faceCentroidPoints, GL_POINTS),
|
||||||
m_render_vertices(m_uniqueVertexPoints, GL_POINTS),
|
m_render_vertices(m_uniqueVertexPoints, GL_POINTS),
|
||||||
m_render_edges(m_uniqueEdgePoints, GL_POINTS),
|
m_render_edges(m_uniqueEdgePoints, GL_POINTS),
|
||||||
m_planeChanged(false),
|
|
||||||
m_transformChanged(false),
|
|
||||||
m_evaluateTransform(evaluateTransform),
|
m_evaluateTransform(evaluateTransform),
|
||||||
m_boundsChanged(boundsChanged)
|
m_boundsChanged(boundsChanged),
|
||||||
|
m_planeChanged(false),
|
||||||
|
m_transformChanged(false)
|
||||||
{
|
{
|
||||||
planeChanged();
|
planeChanged();
|
||||||
}
|
}
|
||||||
|
@ -1748,10 +1748,10 @@ public:
|
||||||
m_render_faces(m_faceCentroidPoints, GL_POINTS),
|
m_render_faces(m_faceCentroidPoints, GL_POINTS),
|
||||||
m_render_vertices(m_uniqueVertexPoints, GL_POINTS),
|
m_render_vertices(m_uniqueVertexPoints, GL_POINTS),
|
||||||
m_render_edges(m_uniqueEdgePoints, GL_POINTS),
|
m_render_edges(m_uniqueEdgePoints, GL_POINTS),
|
||||||
m_planeChanged(false),
|
|
||||||
m_transformChanged(false),
|
|
||||||
m_evaluateTransform(evaluateTransform),
|
m_evaluateTransform(evaluateTransform),
|
||||||
m_boundsChanged(boundsChanged)
|
m_boundsChanged(boundsChanged),
|
||||||
|
m_planeChanged(false),
|
||||||
|
m_transformChanged(false)
|
||||||
{
|
{
|
||||||
copy(other);
|
copy(other);
|
||||||
}
|
}
|
||||||
|
@ -1759,6 +1759,7 @@ public:
|
||||||
TransformNode(other),
|
TransformNode(other),
|
||||||
Bounded(other),
|
Bounded(other),
|
||||||
Cullable(other),
|
Cullable(other),
|
||||||
|
Snappable(),
|
||||||
Undoable(other),
|
Undoable(other),
|
||||||
FaceObserver(other),
|
FaceObserver(other),
|
||||||
Filterable(other),
|
Filterable(other),
|
||||||
|
|
|
@ -534,6 +534,7 @@ public:
|
||||||
TransformNode(other),
|
TransformNode(other),
|
||||||
Bounded(other),
|
Bounded(other),
|
||||||
Cullable(other),
|
Cullable(other),
|
||||||
|
Snappable(),
|
||||||
Undoable(other),
|
Undoable(other),
|
||||||
Filterable(other),
|
Filterable(other),
|
||||||
Nameable(other),
|
Nameable(other),
|
||||||
|
|
Loading…
Reference in a new issue