TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

win32 alignment issues

Browse Source
This commit is contained in:
David Rose 2011-12-20 00:17:08 +00:00
parent 8b3ec4b1ba
commit ba249508c4
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
panda/src/bullet/bulletDebugNode.cxx
View File

@ -245,8 +245,8 @@ sync_b2p(btDynamicsWorld *world) {
vwriter.add_data3(m.xform_point(line._p0)); vwriter.add_data3(m.xform_point(line._p0));
vwriter.add_data3(m.xform_point(line._p1)); vwriter.add_data3(m.xform_point(line._p1));
cwriter.add_data4(line._color); cwriter.add_data4(LVecBase4(line._color));
cwriter.add_data4(line._color); cwriter.add_data4(LVecBase4(line._color));
prim->add_vertex(v++); prim->add_vertex(v++);
prim->add_vertex(v++); prim->add_vertex(v++);
@ -282,9 +282,9 @@ sync_b2p(btDynamicsWorld *world) {
vwriter.add_data3(m.xform_point(tri._p0)); vwriter.add_data3(m.xform_point(tri._p0));
vwriter.add_data3(m.xform_point(tri._p1)); vwriter.add_data3(m.xform_point(tri._p1));
vwriter.add_data3(m.xform_point(tri._p2)); vwriter.add_data3(m.xform_point(tri._p2));
cwriter.add_data4(tri._color); cwriter.add_data4(LVecBase4(tri._color));
cwriter.add_data4(tri._color); cwriter.add_data4(LVecBase4(tri._color));
cwriter.add_data4(tri._color); cwriter.add_data4(LVecBase4(tri._color));
prim->add_vertex(v++); prim->add_vertex(v++);
prim->add_vertex(v++); prim->add_vertex(v++);
@ -356,9 +356,9 @@ drawLine(const btVector3 &from, const btVector3 &to, const btVector3 &color) {
line._p1 = LVecBase3((PN_stdfloat)to.getX(), line._p1 = LVecBase3((PN_stdfloat)to.getX(),
(PN_stdfloat)to.getY(), (PN_stdfloat)to.getY(),
(PN_stdfloat)to.getZ()); (PN_stdfloat)to.getZ());
line._color = LColor((PN_stdfloat)r, line._color = UnalignedLVecBase4((PN_stdfloat)r,
(PN_stdfloat)g, (PN_stdfloat)g,
(PN_stdfloat)b, 1.0f); (PN_stdfloat)b, 1.0f);
_lines.push_back(line); _lines.push_back(line);
} }
@ -389,9 +389,9 @@ drawTriangle(const btVector3 &v0, const btVector3 &v1, const btVector3 &v2, cons
(PN_stdfloat)v2.getY(), (PN_stdfloat)v2.getY(),
(PN_stdfloat)v2.getZ()); (PN_stdfloat)v2.getZ());
tri._color = LColor((PN_stdfloat)r, tri._color = UnalignedLVecBase4((PN_stdfloat)r,
(PN_stdfloat)g, (PN_stdfloat)g,
(PN_stdfloat)b, 1.0f); (PN_stdfloat)b, 1.0f);
_triangles.push_back(tri); _triangles.push_back(tri);

4
panda/src/bullet/bulletDebugNode.h
View File

@ -52,14 +52,14 @@ private:
struct Line { struct Line {
LVecBase3 _p0; LVecBase3 _p0;
LVecBase3 _p1; LVecBase3 _p1;
LColor _color; UnalignedLVecBase4 _color;
}; };
struct Triangle { struct Triangle {
LVecBase3 _p0; LVecBase3 _p0;
LVecBase3 _p1; LVecBase3 _p1;
LVecBase3 _p2; LVecBase3 _p2;
LColor _color; UnalignedLVecBase4 _color;
}; };
class DebugDraw : public btIDebugDraw { class DebugDraw : public btIDebugDraw {

2
panda/src/physics/baseIntegrator.h
View File

@ -35,7 +35,7 @@ class Physical;
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
class EXPCL_PANDAPHYSICS BaseIntegrator : public ReferenceCount { class EXPCL_PANDAPHYSICS BaseIntegrator : public ReferenceCount {
public: public:
typedef pvector<LMatrix4> MatrixVector; typedef epvector<LMatrix4> MatrixVector;
typedef pvector<PT(LinearForce)> LinearForceVector; typedef pvector<PT(LinearForce)> LinearForceVector;
typedef pvector<PT(AngularForce)> AngularForceVector; typedef pvector<PT(AngularForce)> AngularForceVector;