]> git.leopard-lacewing.eu Git - cgue_weave.git/commitdiff
moved modelMat from IMesh to IMetaMesh
authorPeter Schaefer <schaeferpm@gmail.com>
Thu, 4 Jun 2015 07:35:57 +0000 (09:35 +0200)
committerPeter Schaefer <schaeferpm@gmail.com>
Thu, 4 Jun 2015 07:35:57 +0000 (09:35 +0200)
Weave/Graphix/Model/IMesh.cpp
Weave/Graphix/Model/IMesh.h
Weave/Graphix/Model/IMetaMesh.cpp
Weave/Graphix/Model/IMetaMesh.h
res/bullet3-2.83.4/bin/BulletCollision_vs2010_debug.lib
res/bullet3-2.83.4/bin/BulletDynamics_vs2010_debug.lib
res/bullet3-2.83.4/bin/LinearMath_vs2010_debug.lib
res/bullet3-2.83.4/build3/vs2010/obj/x32/Debug/BulletCollision/BulletCollision.log
res/bullet3-2.83.4/build3/vs2010/obj/x32/Debug/BulletDynamics/BulletDynamics.log
res/bullet3-2.83.4/build3/vs2010/obj/x32/Debug/LinearMath/LinearMath.log

index 3b30a6d1f48bae9ceef421dd6a9e1896634dec9c..a177f5bd02f969c37b92b36ce29c01b6223c738a 100644 (file)
@@ -60,10 +60,9 @@ typedef IMesh::Node Node;
 //
 //}
 
-IMesh::IMesh(const aiMesh* _mesh, const mat4& _transformation, const vec3& _scale) : modelMat(removeScale(_transformation)), modelpath("IMesh"), root(nullptr)
+IMesh::IMesh(const aiMesh* _mesh, const mat4& _transformation, const vec3& _scale) : modelpath("IMesh"), root(nullptr)
 {
-
-       import(_mesh, numvertices, numfaces, vertex, uvs, normals, index, _scale * getScale(_transformation));
+       import(_mesh, numvertices, numfaces, vertex, uvs, normals, index, _scale);
 
        btConvexHullShape* tmp_shape = new btConvexHullShape();
 
@@ -81,8 +80,8 @@ IMesh::IMesh(const aiMesh* _mesh, const mat4& _transformation, const vec3& _scal
        minB = t(minB);
        maxB = t(maxB);
 
-       vec3 min = (vec3)(modelMat * vec4(minB.getX(), minB.getY(), minB.getZ(),0.f));
-       vec3 max = (vec3)(modelMat * vec4(maxB.getX(), maxB.getY(), maxB.getZ(), 0.f));
+       vec3 min = (vec3)(_transformation * vec4(minB.getX(), minB.getY(), minB.getZ(), 0.f));
+       vec3 max = (vec3)(_transformation * vec4(maxB.getX(), maxB.getY(), maxB.getZ(), 0.f));
 
        vec3 size = (max - min) * .5f;
        vec3 center = (max + min) * .5f;
@@ -113,14 +112,14 @@ IMesh::~IMesh()
        glDeleteBuffers(1, &uvBuffer);
 }
 
-void IMesh::useModelMat(const mat4& _model, Shader* _shader) const
-{
-       //      Model::useModelMat(_model, _shader);
-       //      Model::useModelMat(_model * modelMat, _shader);
-       int tmp = _shader->getUniformLocation("uModel");
-       if (tmp >= 0)
-               glUniformMatrix4fv(tmp, 1, GL_FALSE, value_ptr(_model* modelMat));
-}
+//void IMesh::useModelMat(const mat4& _model, Shader* _shader) const
+//{
+//     //      Model::useModelMat(_model, _shader);
+//     //      Model::useModelMat(_model * modelMat, _shader);
+//     int tmp = _shader->getUniformLocation("uModel");
+//     if (tmp >= 0)
+//             glUniformMatrix4fv(tmp, 1, GL_FALSE, value_ptr(_model* modelMat));
+//}
 
 
 void drawSubBBox(const mat4& _modelMat, const vec4& _color, Node* _node, int _lvl)
index c84aa870c93abfe52bdade03cd2efdf8f9c31807..149efb4c13d8ffbbf654057ba6c708948573fc3f 100644 (file)
@@ -20,7 +20,7 @@ public:
 
        virtual ~IMesh();
 
-       void useModelMat(const mat4& model, Shader* shader) const override;
+       //void useModelMat(const mat4& model, Shader* shader) const override;
 
        void drawBBox(const mat4& modelMat, const vec4& color = vec4(0.9f, 0.f, 0.f, 1.f)) const override;
 
@@ -60,7 +60,6 @@ public:
 protected:
 
        std::string modelpath;
-       mat4 modelMat;
 
        float *vertex = nullptr, *normals = nullptr, *uvs = nullptr;
        uint *index = nullptr;
index c90b1e2138744f43460582a3cf090c1b4478b14e..494a3a03ac4296e2ad05759a387ee8c9fbec70a3 100644 (file)
@@ -30,7 +30,7 @@ IMetaMesh::IMetaMesh(const string& _modelpath, const vec3& _scale) : modelpath(_
        {
                IMesh* tmpIMesh;
                aiMatrix4x4* aimat;
-               mat4 tmpModelMat;
+               mat4 tmpModelMat, tmpModelMatClean;
                //vec3 BBmin, BBmax, tmpMin, tmpMax;
 
                btCompoundShape* tmp_shape = new btCompoundShape;
@@ -38,9 +38,9 @@ IMetaMesh::IMetaMesh(const string& _modelpath, const vec3& _scale) : modelpath(_
                aimat = &(root->mChildren[0]->mTransformation);
 
                tmpModelMat = mat4(aimat->a1, aimat->c1, -aimat->b1, aimat->d1, aimat->a2, aimat->c2, -aimat->b2, aimat->d2, aimat->a3, aimat->c3, -aimat->b3, aimat->d3, aimat->a4, aimat->c4, -aimat->b4, aimat->d4);
-
-               tmpIMesh = new IMesh(scene->mMeshes[0], tmpModelMat, _scale);
-               models.push_back(tmpIMesh);
+               tmpModelMatClean = removeScale(tmpModelMat);
+               tmpIMesh = new IMesh(scene->mMeshes[0], tmpModelMatClean, _scale* getScale(tmpModelMat));
+               models.push_back(std::pair<IMesh*,mat4>(tmpIMesh,tmpModelMatClean));
                setBB(tmpIMesh->getBBox());
 
                
@@ -51,8 +51,9 @@ IMetaMesh::IMetaMesh(const string& _modelpath, const vec3& _scale) : modelpath(_
                        aimat = &(root->mChildren[i]->mTransformation);
 
                        tmpModelMat = mat4(aimat->a1, aimat->c1, -aimat->b1, aimat->d1, aimat->a2, aimat->c2, -aimat->b2, aimat->d2, aimat->a3, aimat->c3, -aimat->b3, aimat->d3, aimat->a4, aimat->c4, -aimat->b4, aimat->d4);
-                       tmpIMesh = new IMesh(scene->mMeshes[i], tmpModelMat,_scale);
-                       models.push_back(tmpIMesh);
+                       tmpModelMatClean = removeScale(tmpModelMat);
+                       tmpIMesh = new IMesh(scene->mMeshes[i], tmpModelMatClean, _scale* getScale(tmpModelMat));
+                       models.push_back(std::pair<IMesh*, mat4>(tmpIMesh, tmpModelMatClean));
                        updateBB(tmpIMesh->getBBox());
 
                        tmp_shape->addChildShape(btTransform(), *tmpIMesh);
@@ -81,7 +82,7 @@ IMetaMesh::~IMetaMesh()
 {
        for (auto i = models.begin(); i != models.end(); ++i)
        {
-               delete (*i);
+               delete i->first;
        }
 }
 
@@ -89,7 +90,7 @@ void IMetaMesh::bindShader(Shader* _shader)
 {
        for (auto i = models.begin(); i != models.end(); ++i)
        {
-               (*i)->bindShader(_shader);
+               i->first->bindShader(_shader);
        }
 }
 
@@ -97,7 +98,7 @@ void IMetaMesh::drawModel(Shader* _shader, Texture* _texture, const mat4& _model
 {
        for (auto i = models.begin(); i != models.end(); ++i)
        {
-               (*i)->drawModel(_shader, _texture, _modelMat);
+               i->first->drawModel(_shader, _texture, _modelMat* i->second);
        }
 }
 
@@ -106,7 +107,10 @@ void IMetaMesh::drawBBox(const mat4& _modelMat,const vec4& _color) const
 {
 //     Model::drawBBox(_modelMat, vec4(0.f,.3f,.9f,1.f));
        if (models.size() == 1)
-               models.front()->drawBBox(_modelMat, _color);
+       {
+               auto i = models.front();
+               i.first->drawBBox(_modelMat* i.second, _color);
+       }
        else
        {
                Model::drawBBox(_modelMat, _color);
@@ -114,7 +118,7 @@ void IMetaMesh::drawBBox(const mat4& _modelMat,const vec4& _color) const
                {
                        for (auto i = models.begin(); i != models.end(); ++i)
                        {
-                               (*i)->drawBBox(_modelMat, _color*0.8f);
+                               i->first->drawBBox(_modelMat* i->second, _color*0.8f);
                        }
                }
        }
@@ -131,7 +135,7 @@ Overlap IMetaMesh::checkColS2O(const SplitMat& _mMat, const Model* _model, const
        Overlap tmp,secondSubBB;
        for (auto i = models.begin(); i != models.end(); ++i)
        {
-               tmp = (*i)->checkColS2O(_mMat, _model, _modelMat);
+               tmp = i->first->checkColS2O(_mMat, _model, _modelMat);
                if (tmp)
                {
                        secondSubBB.update(tmp);
@@ -154,7 +158,7 @@ Overlap IMetaMesh::checkColO2SBox(const SplitMat& _mMat, const Box& _boxB, const
        Overlap tmp, secondSubBB;
        for (auto i = models.begin(); i != models.end(); ++i)
        {
-               tmp = (*i)->checkColO2SBox(_mMat, _boxB, _modelMat);
+               tmp = i->first->checkColO2SBox(_mMat, _boxB, _modelMat);
                if (tmp)
                {
                        secondSubBB.update(tmp);
index 84ab3b8d65ec145b4aaaa83d79f34ee1243aa184..b8a4bfcb3a16066cd33911a5c7139ceb8bf97711 100644 (file)
@@ -31,6 +31,7 @@ public:
 protected:
 
        std::string modelpath;
-       std::list<IMesh*> models;
+       //std::list<IMesh*> models;
+       std::list<std::pair<IMesh*, mat4>> models;
 };
 
index 4401a49a8b8e203ab2cbd6536403cdf88285c4c7..cd9d88fc531be2fe09dab6121c524e52df3c228b 100644 (file)
Binary files a/res/bullet3-2.83.4/bin/BulletCollision_vs2010_debug.lib and b/res/bullet3-2.83.4/bin/BulletCollision_vs2010_debug.lib differ
index 4b085cc128e4535303566d7a3889fc2ef69a5c44..b03c183ff59215b1154df358708ecd3346ac8572 100644 (file)
Binary files a/res/bullet3-2.83.4/bin/BulletDynamics_vs2010_debug.lib and b/res/bullet3-2.83.4/bin/BulletDynamics_vs2010_debug.lib differ
index a7561b0b01a5d5f274203f16d37c1ce56c47df3f..31140dcdc45aa80b04b0a83ae0141edeb91e7611 100644 (file)
Binary files a/res/bullet3-2.83.4/bin/LinearMath_vs2010_debug.lib and b/res/bullet3-2.83.4/bin/LinearMath_vs2010_debug.lib differ
index 99aa4ea6a6a73d6a64075a5d22171604e43aa114..8acfdc7edeb35ca27c9d700bb35ba4f7b2571801 100644 (file)
@@ -1,103 +1,6 @@
-Build started 29.05.2015 11:20:30.
+Build started 04.06.2015 09:09:22.
      1>Project "C:\Daten\Visual Studio 2013\Projects\CGUE2015_Weave\res\bullet3-2.83.4\build3\vs2010\BulletCollision.vcxproj" on node 2 (Build target(s)).
-     1>ClCompile:
-         C:\Program Files (x86)\Microsoft Visual Studio 13.0\VC\bin\CL.exe /c /I..\..\src /Zi /nologo /W3 /WX- /Od /Oy- /D _DEBUG=1 /D _MBCS /Gm- /EHsc /RTC1 /MD /GS /Gy /fp:fast /Zc:wchar_t /Zc:forScope /Fo"obj\x32\Debug\BulletCollision\\" /Fd"..\..\bin\BulletCollision_vs2010_debug.pdb" /Gd /TP /analyze- /errorReport:prompt /MP ..\..\src\BulletCollision\BroadphaseCollision\btAxisSweep3.cpp ..\..\src\BulletCollision\BroadphaseCollision\btBroadphaseProxy.cpp ..\..\src\BulletCollision\BroadphaseCollision\btCollisionAlgorithm.cpp ..\..\src\BulletCollision\BroadphaseCollision\btDbvt.cpp ..\..\src\BulletCollision\BroadphaseCollision\btDbvtBroadphase.cpp ..\..\src\BulletCollision\BroadphaseCollision\btDispatcher.cpp ..\..\src\BulletCollision\BroadphaseCollision\btMultiSapBroadphase.cpp ..\..\src\BulletCollision\BroadphaseCollision\btOverlappingPairCache.cpp ..\..\src\BulletCollision\BroadphaseCollision\btQuantizedBvh.cpp ..\..\src\BulletCollision\BroadphaseCollision\btSimpleBroadphase.cpp ..\..\src\BulletCollision\CollisionDispatch\btActivatingCollisionAlgorithm.cpp ..\..\src\BulletCollision\CollisionDispatch\btBox2dBox2dCollisionAlgorithm.cpp ..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.cpp ..\..\src\BulletCollision\CollisionDispatch\btBoxBoxDetector.cpp ..\..\src\BulletCollision\CollisionDispatch\btCollisionDispatcher.cpp ..\..\src\BulletCollision\CollisionDispatch\btCollisionObject.cpp ..\..\src\BulletCollision\CollisionDispatch\btCollisionWorld.cpp ..\..\src\BulletCollision\CollisionDispatch\btCollisionWorldImporter.cpp ..\..\src\BulletCollision\CollisionDispatch\btCompoundCollisionAlgorithm.cpp ..\..\src\BulletCollision\CollisionDispatch\btCompoundCompoundCollisionAlgorithm.cpp ..\..\src\BulletCollision\CollisionDispatch\btConvex2dConvex2dAlgorithm.cpp ..\..\src\BulletCollision\CollisionDispatch\btConvexConcaveCollisionAlgorithm.cpp ..\..\src\BulletCollision\CollisionDispatch\btConvexConvexAlgorithm.cpp ..\..\src\BulletCollision\CollisionDispatch\btConvexPlaneCollisionAlgorithm.cpp ..\..\src\BulletCollision\CollisionDispatch\btDefaultCollisionConfiguration.cpp ..\..\src\BulletCollision\CollisionDispatch\btEmptyCollisionAlgorithm.cpp ..\..\src\BulletCollision\CollisionDispatch\btGhostObject.cpp ..\..\src\BulletCollision\CollisionDispatch\btHashedSimplePairCache.cpp ..\..\src\BulletCollision\CollisionDispatch\btInternalEdgeUtility.cpp ..\..\src\BulletCollision\CollisionDispatch\btManifoldResult.cpp ..\..\src\BulletCollision\CollisionDispatch\btSimulationIslandManager.cpp ..\..\src\BulletCollision\CollisionDispatch\btSphereBoxCollisionAlgorithm.cpp ..\..\src\BulletCollision\CollisionDispatch\btSphereSphereCollisionAlgorithm.cpp ..\..\src\BulletCollision\CollisionDispatch\btSphereTriangleCollisionAlgorithm.cpp ..\..\src\BulletCollision\CollisionDispatch\btUnionFind.cpp ..\..\src\BulletCollision\CollisionDispatch\SphereTriangleDetector.cpp ..\..\src\BulletCollision\CollisionShapes\btBox2dShape.cpp ..\..\src\BulletCollision\CollisionShapes\btBoxShape.cpp ..\..\src\BulletCollision\CollisionShapes\btBvhTriangleMeshShape.cpp ..\..\src\BulletCollision\CollisionShapes\btCapsuleShape.cpp ..\..\src\BulletCollision\CollisionShapes\btCollisionShape.cpp ..\..\src\BulletCollision\CollisionShapes\btCompoundShape.cpp ..\..\src\BulletCollision\CollisionShapes\btConcaveShape.cpp ..\..\src\BulletCollision\CollisionShapes\btConeShape.cpp ..\..\src\BulletCollision\CollisionShapes\btConvex2dShape.cpp ..\..\src\BulletCollision\CollisionShapes\btConvexHullShape.cpp ..\..\src\BulletCollision\CollisionShapes\btConvexInternalShape.cpp ..\..\src\BulletCollision\CollisionShapes\btConvexPointCloudShape.cpp ..\..\src\BulletCollision\CollisionShapes\btConvexPolyhedron.cpp ..\..\src\BulletCollision\CollisionShapes\btConvexShape.cpp ..\..\src\BulletCollision\CollisionShapes\btConvexTriangleMeshShape.cpp ..\..\src\BulletCollision\CollisionShapes\btCylinderShape.cpp ..\..\src\BulletCollision\CollisionShapes\btEmptyShape.cpp ..\..\src\BulletCollision\CollisionShapes\btHeightfieldTerrainShape.cpp ..\..\src\BulletCollision\CollisionShapes\btMinkowskiSumShape.cpp ..\..\src\BulletCollision\CollisionShapes\btMultimaterialTriangleMeshShape.cpp ..\..\src\BulletCollision\CollisionShapes\btMultiSphereShape.cpp ..\..\src\BulletCollision\CollisionShapes\btOptimizedBvh.cpp ..\..\src\BulletCollision\CollisionShapes\btPolyhedralConvexShape.cpp ..\..\src\BulletCollision\CollisionShapes\btScaledBvhTriangleMeshShape.cpp ..\..\src\BulletCollision\CollisionShapes\btShapeHull.cpp ..\..\src\BulletCollision\CollisionShapes\btSphereShape.cpp ..\..\src\BulletCollision\CollisionShapes\btStaticPlaneShape.cpp ..\..\src\BulletCollision\CollisionShapes\btStridingMeshInterface.cpp ..\..\src\BulletCollision\CollisionShapes\btTetrahedronShape.cpp ..\..\src\BulletCollision\CollisionShapes\btTriangleBuffer.cpp ..\..\src\BulletCollision\CollisionShapes\btTriangleCallback.cpp ..\..\src\BulletCollision\CollisionShapes\btTriangleIndexVertexArray.cpp ..\..\src\BulletCollision\CollisionShapes\btTriangleIndexVertexMaterialArray.cpp ..\..\src\BulletCollision\CollisionShapes\btTriangleMesh.cpp ..\..\src\BulletCollision\CollisionShapes\btTriangleMeshShape.cpp ..\..\src\BulletCollision\CollisionShapes\btUniformScalingShape.cpp ..\..\src\BulletCollision\Gimpact\btContactProcessing.cpp ..\..\src\BulletCollision\Gimpact\btGenericPoolAllocator.cpp ..\..\src\BulletCollision\Gimpact\btGImpactBvh.cpp ..\..\src\BulletCollision\Gimpact\btGImpactCollisionAlgorithm.cpp ..\..\src\BulletCollision\Gimpact\btGImpactQuantizedBvh.cpp ..\..\src\BulletCollision\Gimpact\btGImpactShape.cpp ..\..\src\BulletCollision\Gimpact\btTriangleShapeEx.cpp ..\..\src\BulletCollision\Gimpact\gim_box_set.cpp ..\..\src\BulletCollision\Gimpact\gim_contact.cpp ..\..\src\BulletCollision\Gimpact\gim_memory.cpp ..\..\src\BulletCollision\Gimpact\gim_tri_collision.cpp ..\..\src\BulletCollision\NarrowPhaseCollision\btContinuousConvexCollision.cpp ..\..\src\BulletCollision\NarrowPhaseCollision\btConvexCast.cpp ..\..\src\BulletCollision\NarrowPhaseCollision\btGjkConvexCast.cpp ..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpa2.cpp ..\..\src\BulletCollision\NarrowPhaseCollision\btGjkEpaPenetrationDepthSolver.cpp ..\..\src\BulletCollision\NarrowPhaseCollision\btGjkPairDetector.cpp ..\..\src\BulletCollision\NarrowPhaseCollision\btMinkowskiPenetrationDepthSolver.cpp ..\..\src\BulletCollision\NarrowPhaseCollision\btPersistentManifold.cpp ..\..\src\BulletCollision\NarrowPhaseCollision\btPolyhedralContactClipping.cpp ..\..\src\BulletCollision\NarrowPhaseCollision\btRaycastCallback.cpp ..\..\src\BulletCollision\NarrowPhaseCollision\btSubSimplexConvexCast.cpp ..\..\src\BulletCollision\NarrowPhaseCollision\btVoronoiSimplexSolver.cpp
-         btAxisSweep3.cpp
-         btBroadphaseProxy.cpp
-         btCollisionAlgorithm.cpp
-         btDbvt.cpp
-         btDbvtBroadphase.cpp
-         btDispatcher.cpp
-         btMultiSapBroadphase.cpp
-         btOverlappingPairCache.cpp
-         btQuantizedBvh.cpp
-         btSimpleBroadphase.cpp
-         btActivatingCollisionAlgorithm.cpp
-         btBox2dBox2dCollisionAlgorithm.cpp
-         btBoxBoxCollisionAlgorithm.cpp
-         btBoxBoxDetector.cpp
-         btCollisionDispatcher.cpp
-         btCollisionObject.cpp
-         btCollisionWorld.cpp
-         btCollisionWorldImporter.cpp
-         btCompoundCollisionAlgorithm.cpp
-         btCompoundCompoundCollisionAlgorithm.cpp
-         btConvex2dConvex2dAlgorithm.cpp
-         btConvexConcaveCollisionAlgorithm.cpp
-         btConvexConvexAlgorithm.cpp
-         btConvexPlaneCollisionAlgorithm.cpp
-         btDefaultCollisionConfiguration.cpp
-         btEmptyCollisionAlgorithm.cpp
-         btGhostObject.cpp
-         btHashedSimplePairCache.cpp
-         btInternalEdgeUtility.cpp
-         btManifoldResult.cpp
-         btSimulationIslandManager.cpp
-         btSphereBoxCollisionAlgorithm.cpp
-         btSphereSphereCollisionAlgorithm.cpp
-         btSphereTriangleCollisionAlgorithm.cpp
-         btUnionFind.cpp
-         SphereTriangleDetector.cpp
-         btBox2dShape.cpp
-         btBoxShape.cpp
-         btBvhTriangleMeshShape.cpp
-         btCapsuleShape.cpp
-         btCollisionShape.cpp
-         btCompoundShape.cpp
-         btConcaveShape.cpp
-         btConeShape.cpp
-         btConvex2dShape.cpp
-         btConvexHullShape.cpp
-         btConvexInternalShape.cpp
-         btConvexPointCloudShape.cpp
-         btConvexPolyhedron.cpp
-         btConvexShape.cpp
-         btConvexTriangleMeshShape.cpp
-         btCylinderShape.cpp
-         btEmptyShape.cpp
-         btHeightfieldTerrainShape.cpp
-         btMinkowskiSumShape.cpp
-         btMultimaterialTriangleMeshShape.cpp
-         btMultiSphereShape.cpp
-         btOptimizedBvh.cpp
-         btPolyhedralConvexShape.cpp
-         btScaledBvhTriangleMeshShape.cpp
-         btShapeHull.cpp
-         btSphereShape.cpp
-         btStaticPlaneShape.cpp
-         btStridingMeshInterface.cpp
-         btTetrahedronShape.cpp
-         btTriangleBuffer.cpp
-         btTriangleCallback.cpp
-         btTriangleIndexVertexArray.cpp
-         btTriangleIndexVertexMaterialArray.cpp
-         btTriangleMesh.cpp
-         btTriangleMeshShape.cpp
-         btUniformScalingShape.cpp
-         btContactProcessing.cpp
-         btGenericPoolAllocator.cpp
-         btGImpactBvh.cpp
-         btGImpactCollisionAlgorithm.cpp
-         btGImpactQuantizedBvh.cpp
-         btGImpactShape.cpp
-         btTriangleShapeEx.cpp
-         gim_box_set.cpp
-         gim_contact.cpp
-         gim_memory.cpp
-         gim_tri_collision.cpp
-         btContinuousConvexCollision.cpp
-         btConvexCast.cpp
-         btGjkConvexCast.cpp
-         btGjkEpa2.cpp
-         btGjkEpaPenetrationDepthSolver.cpp
-         btGjkPairDetector.cpp
-         btMinkowskiPenetrationDepthSolver.cpp
-         btPersistentManifold.cpp
-         btPolyhedralContactClipping.cpp
-         btRaycastCallback.cpp
-         btSubSimplexConvexCast.cpp
-         btVoronoiSimplexSolver.cpp
-       Lib:
+     1>Lib:
          C:\Program Files (x86)\Microsoft Visual Studio 13.0\VC\bin\Lib.exe /OUT:"..\..\bin\BulletCollision_vs2010_debug.lib" /NOLOGO /MACHINE:X86 obj\x32\Debug\BulletCollision\btAxisSweep3.obj
          obj\x32\Debug\BulletCollision\btBroadphaseProxy.obj
          obj\x32\Debug\BulletCollision\btCollisionAlgorithm.obj
 
 Build succeeded.
 
-Time Elapsed 00:00:13.03
+Time Elapsed 00:00:00.89
index 050645a8b7c683f6fb76981a22373624a07e356e..1c3450f68c8247541bea0e63aa04051ab5a1f2dc 100644 (file)
@@ -1,40 +1,6 @@
-Build started 29.05.2015 11:20:30.
+Build started 04.06.2015 09:09:22.
      1>Project "C:\Daten\Visual Studio 2013\Projects\CGUE2015_Weave\res\bullet3-2.83.4\build3\vs2010\BulletDynamics.vcxproj" on node 3 (Build target(s)).
-     1>ClCompile:
-         C:\Program Files (x86)\Microsoft Visual Studio 13.0\VC\bin\CL.exe /c /I..\..\src /Zi /nologo /W3 /WX- /Od /Oy- /D _DEBUG=1 /D _MBCS /Gm- /EHsc /RTC1 /MD /GS /Gy /fp:fast /Zc:wchar_t /Zc:forScope /Fo"obj\x32\Debug\BulletDynamics\\" /Fd"..\..\bin\BulletDynamics_vs2010_debug.pdb" /Gd /TP /analyze- /errorReport:prompt /MP ..\..\src\BulletDynamics\Dynamics\btDiscreteDynamicsWorld.cpp ..\..\src\BulletDynamics\Dynamics\btRigidBody.cpp ..\..\src\BulletDynamics\Dynamics\btSimpleDynamicsWorld.cpp ..\..\src\BulletDynamics\ConstraintSolver\btConeTwistConstraint.cpp ..\..\src\BulletDynamics\ConstraintSolver\btContactConstraint.cpp ..\..\src\BulletDynamics\ConstraintSolver\btFixedConstraint.cpp ..\..\src\BulletDynamics\ConstraintSolver\btGearConstraint.cpp ..\..\src\BulletDynamics\ConstraintSolver\btGeneric6DofConstraint.cpp ..\..\src\BulletDynamics\ConstraintSolver\btGeneric6DofSpring2Constraint.cpp ..\..\src\BulletDynamics\ConstraintSolver\btGeneric6DofSpringConstraint.cpp ..\..\src\BulletDynamics\ConstraintSolver\btHinge2Constraint.cpp ..\..\src\BulletDynamics\ConstraintSolver\btHingeConstraint.cpp ..\..\src\BulletDynamics\ConstraintSolver\btNNCGConstraintSolver.cpp ..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.cpp ..\..\src\BulletDynamics\ConstraintSolver\btSequentialImpulseConstraintSolver.cpp ..\..\src\BulletDynamics\ConstraintSolver\btSliderConstraint.cpp ..\..\src\BulletDynamics\ConstraintSolver\btSolve2LinearConstraint.cpp ..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp ..\..\src\BulletDynamics\ConstraintSolver\btUniversalConstraint.cpp ..\..\src\BulletDynamics\Featherstone\btMultiBody.cpp ..\..\src\BulletDynamics\Featherstone\btMultiBodyConstraint.cpp ..\..\src\BulletDynamics\Featherstone\btMultiBodyConstraintSolver.cpp ..\..\src\BulletDynamics\Featherstone\btMultiBodyDynamicsWorld.cpp ..\..\src\BulletDynamics\Featherstone\btMultiBodyJointLimitConstraint.cpp ..\..\src\BulletDynamics\Featherstone\btMultiBodyJointMotor.cpp ..\..\src\BulletDynamics\Featherstone\btMultiBodyPoint2Point.cpp ..\..\src\BulletDynamics\MLCPSolvers\btDantzigLCP.cpp ..\..\src\BulletDynamics\MLCPSolvers\btLemkeAlgorithm.cpp ..\..\src\BulletDynamics\MLCPSolvers\btMLCPSolver.cpp ..\..\src\BulletDynamics\Vehicle\btRaycastVehicle.cpp ..\..\src\BulletDynamics\Vehicle\btWheelInfo.cpp ..\..\src\BulletDynamics\Character\btKinematicCharacterController.cpp
-         btDiscreteDynamicsWorld.cpp
-         btRigidBody.cpp
-         btSimpleDynamicsWorld.cpp
-         btConeTwistConstraint.cpp
-         btContactConstraint.cpp
-         btFixedConstraint.cpp
-         btGearConstraint.cpp
-         btGeneric6DofConstraint.cpp
-         btGeneric6DofSpring2Constraint.cpp
-         btGeneric6DofSpringConstraint.cpp
-         btHinge2Constraint.cpp
-         btHingeConstraint.cpp
-         btNNCGConstraintSolver.cpp
-         btPoint2PointConstraint.cpp
-         btSequentialImpulseConstraintSolver.cpp
-         btSliderConstraint.cpp
-         btSolve2LinearConstraint.cpp
-         btTypedConstraint.cpp
-         btUniversalConstraint.cpp
-         btMultiBody.cpp
-         btMultiBodyConstraint.cpp
-         btMultiBodyConstraintSolver.cpp
-         btMultiBodyDynamicsWorld.cpp
-         btMultiBodyJointLimitConstraint.cpp
-         btMultiBodyJointMotor.cpp
-         btMultiBodyPoint2Point.cpp
-         btDantzigLCP.cpp
-         btLemkeAlgorithm.cpp
-         btMLCPSolver.cpp
-         btRaycastVehicle.cpp
-         btWheelInfo.cpp
-         btKinematicCharacterController.cpp
-       Lib:
+     1>Lib:
          C:\Program Files (x86)\Microsoft Visual Studio 13.0\VC\bin\Lib.exe /OUT:"..\..\bin\BulletDynamics_vs2010_debug.lib" /NOLOGO /MACHINE:X86 obj\x32\Debug\BulletDynamics\btDiscreteDynamicsWorld.obj
          obj\x32\Debug\BulletDynamics\btRigidBody.obj
          obj\x32\Debug\BulletDynamics\btSimpleDynamicsWorld.obj
@@ -72,4 +38,4 @@
 
 Build succeeded.
 
-Time Elapsed 00:00:08.37
+Time Elapsed 00:00:00.67
index a5314a70f3356a706c84f56c39c1f9edf881f62f..655358f02fdcc6387541daa3b07e9d9475fa29ee 100644 (file)
@@ -1,16 +1,6 @@
-Build started 29.05.2015 11:20:30.
+Build started 04.06.2015 09:09:22.
      1>Project "C:\Daten\Visual Studio 2013\Projects\CGUE2015_Weave\res\bullet3-2.83.4\build3\vs2010\LinearMath.vcxproj" on node 4 (Build target(s)).
-     1>ClCompile:
-         C:\Program Files (x86)\Microsoft Visual Studio 13.0\VC\bin\CL.exe /c /I..\..\src /Zi /nologo /W3 /WX- /Od /Oy- /D _DEBUG=1 /D _MBCS /Gm- /EHsc /RTC1 /MD /GS /Gy /fp:fast /Zc:wchar_t /Zc:forScope /Fo"obj\x32\Debug\LinearMath\\" /Fd"..\..\bin\LinearMath_vs2010_debug.pdb" /Gd /TP /analyze- /errorReport:prompt /MP ..\..\src\LinearMath\btAlignedAllocator.cpp ..\..\src\LinearMath\btConvexHull.cpp ..\..\src\LinearMath\btConvexHullComputer.cpp ..\..\src\LinearMath\btGeometryUtil.cpp ..\..\src\LinearMath\btPolarDecomposition.cpp ..\..\src\LinearMath\btQuickprof.cpp ..\..\src\LinearMath\btSerializer.cpp ..\..\src\LinearMath\btVector3.cpp
-         btAlignedAllocator.cpp
-         btConvexHull.cpp
-         btConvexHullComputer.cpp
-         btGeometryUtil.cpp
-         btPolarDecomposition.cpp
-         btQuickprof.cpp
-         btSerializer.cpp
-         btVector3.cpp
-       Lib:
+     1>Lib:
          C:\Program Files (x86)\Microsoft Visual Studio 13.0\VC\bin\Lib.exe /OUT:"..\..\bin\LinearMath_vs2010_debug.lib" /NOLOGO /MACHINE:X86 obj\x32\Debug\LinearMath\btAlignedAllocator.obj
          obj\x32\Debug\LinearMath\btConvexHull.obj
          obj\x32\Debug\LinearMath\btConvexHullComputer.obj
@@ -24,4 +14,4 @@
 
 Build succeeded.
 
-Time Elapsed 00:00:07.08
+Time Elapsed 00:00:00.53