From 61193e3b8a3cefbb51e6f9c884a1cd563933bb33 Mon Sep 17 00:00:00 2001 From: Peter Schaefer Date: Thu, 4 Jun 2015 09:35:57 +0200 Subject: [PATCH] moved modelMat from IMesh to IMetaMesh --- Weave/Graphix/Model/IMesh.cpp | 25 ++--- Weave/Graphix/Model/IMesh.h | 3 +- Weave/Graphix/Model/IMetaMesh.cpp | 30 ++--- Weave/Graphix/Model/IMetaMesh.h | 3 +- .../bin/BulletCollision_vs2010_debug.lib | Bin 8442364 -> 8442364 bytes .../bin/BulletDynamics_vs2010_debug.lib | Bin 4241670 -> 4241670 bytes .../bin/LinearMath_vs2010_debug.lib | Bin 694236 -> 694236 bytes .../Debug/BulletCollision/BulletCollision.log | 103 +----------------- .../Debug/BulletDynamics/BulletDynamics.log | 40 +------ .../obj/x32/Debug/LinearMath/LinearMath.log | 16 +-- 10 files changed, 41 insertions(+), 179 deletions(-) diff --git a/Weave/Graphix/Model/IMesh.cpp b/Weave/Graphix/Model/IMesh.cpp index 3b30a6d..a177f5b 100644 --- a/Weave/Graphix/Model/IMesh.cpp +++ b/Weave/Graphix/Model/IMesh.cpp @@ -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) diff --git a/Weave/Graphix/Model/IMesh.h b/Weave/Graphix/Model/IMesh.h index c84aa87..149efb4 100644 --- a/Weave/Graphix/Model/IMesh.h +++ b/Weave/Graphix/Model/IMesh.h @@ -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; diff --git a/Weave/Graphix/Model/IMetaMesh.cpp b/Weave/Graphix/Model/IMetaMesh.cpp index c90b1e2..494a3a0 100644 --- a/Weave/Graphix/Model/IMetaMesh.cpp +++ b/Weave/Graphix/Model/IMetaMesh.cpp @@ -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(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(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); diff --git a/Weave/Graphix/Model/IMetaMesh.h b/Weave/Graphix/Model/IMetaMesh.h index 84ab3b8..b8a4bfc 100644 --- a/Weave/Graphix/Model/IMetaMesh.h +++ b/Weave/Graphix/Model/IMetaMesh.h @@ -31,6 +31,7 @@ public: protected: std::string modelpath; - std::list models; + //std::list models; + std::list> models; }; diff --git a/res/bullet3-2.83.4/bin/BulletCollision_vs2010_debug.lib b/res/bullet3-2.83.4/bin/BulletCollision_vs2010_debug.lib index 4401a49a8b8e203ab2cbd6536403cdf88285c4c7..cd9d88fc531be2fe09dab6121c524e52df3c228b 100644 GIT binary patch delta 2080 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 B+I|24 diff --git a/res/bullet3-2.83.4/bin/BulletDynamics_vs2010_debug.lib b/res/bullet3-2.83.4/bin/BulletDynamics_vs2010_debug.lib index 4b085cc128e4535303566d7a3889fc2ef69a5c44..b03c183ff59215b1154df358708ecd3346ac8572 100644 GIT binary patch delta 800 zcmY+?&r8#B9LI6?HC>jg{m6YjI@edfmE}^u)9I#j{kT;p5Bd*ihoF<9?9xDr@GS^3 z#PA{nE`=mSka{2V5IgKJ%ggvW=t~9#<)MQchzbsR9}?c5!{e~$`}IA1zihhvN}DF> zfHTq)?utbtFO83e?*DZNq{tAq7Z!lls^Yr>^f>OJ)?fC?2taP%Xj$DXs(}OMZ&~dGfu3vcr8{1 zEKeEa2DwRY;qp{#=^0<(#-G;HW2NMN+>ZQYMS{rQA#EtKp_zGh5wJac7q^GozXp`L zI@XS>V;#pjs}i=-9i$Vt(x!Z*TuMa~O2sgiie2%3b`kj4(_Kj^Wpu9FTu{oo5viQ9 z(g1nAhxB4zkG?r!7Xc|5!<6hBQ2$3(s1K}AKU$&q>kVa}wBwMp2S|e4Blj_BKS+Q7 E2WI>VIRF3v delta 794 zcmZqs)Wp;V#1o|1jVvq;jf^cCm9{D|{=5p~wkus@+^%$usrnd9Wc!ji%$)3O5arVg z1=u9oPcLQ$VwUZv7qi}zfvPj#zTp7tZhxq{cAz>SX5U^Y!13$@Ov!Yh5{dRQMou8+ z0%Gp%WsE%TLNMuRhcv|7ZwvEmzb(xB=N?ql3@rNf6Yut~pZIRAfvKIo;l8@~_P6u- zyH3Frf=n0NJ|#;)b}_2ZIbOlPOA#6mu!^_8+$;#hLO?7G#3I{YZWh%@g6RU=s4phA zU0+Om+Zm{+Da3fD$KtXu|CmlsxNRlgZhKh*h$Vqo3W%kFSZ2HJW!V+UaGethbi~`4 z&E>W;o69eP1sKpkkQWXI%O{+Js{|Ri-BC$Fqys8s0(MOCDuwOEs}zM`(PRR0jClLv zdLFJRLBr)*-3em_LK6a+fT}yP5S{? z40dm=g!%Sb2@5M&LNWqtxTA- zS{P@t!fmnb8zLCBV^KtYY-KdRiXGXF5z|dx8?P^n4f(WJddpgUmq80>rG_ iXB=d+zm6jNWd?iuml+(}zs%r#egRo#`;SbnC%OP=SxOiH delta 209 zcmcb!UhB?!tqIcXMi!QaM#e^y8*YkiwCK)5=5KzGH!}++u({#pOh!0I;dXH?lw&wq z;kMZJ4H1mmu`p?{$d9dz=2wx_h;R4pX5yI+6WN}i#4J4@#sleSpK*{Gh*^M`b^DBi gZ1&etWWUT{Z~robWBZpGoX;;H%WVIV$@N4R0C8waBLDyZ diff --git a/res/bullet3-2.83.4/build3/vs2010/obj/x32/Debug/BulletCollision/BulletCollision.log b/res/bullet3-2.83.4/build3/vs2010/obj/x32/Debug/BulletCollision/BulletCollision.log index 99aa4ea..8acfdc7 100644 --- a/res/bullet3-2.83.4/build3/vs2010/obj/x32/Debug/BulletCollision/BulletCollision.log +++ b/res/bullet3-2.83.4/build3/vs2010/obj/x32/Debug/BulletCollision/BulletCollision.log @@ -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 @@ -199,4 +102,4 @@ Build succeeded. -Time Elapsed 00:00:13.03 +Time Elapsed 00:00:00.89 diff --git a/res/bullet3-2.83.4/build3/vs2010/obj/x32/Debug/BulletDynamics/BulletDynamics.log b/res/bullet3-2.83.4/build3/vs2010/obj/x32/Debug/BulletDynamics/BulletDynamics.log index 050645a..1c3450f 100644 --- a/res/bullet3-2.83.4/build3/vs2010/obj/x32/Debug/BulletDynamics/BulletDynamics.log +++ b/res/bullet3-2.83.4/build3/vs2010/obj/x32/Debug/BulletDynamics/BulletDynamics.log @@ -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 diff --git a/res/bullet3-2.83.4/build3/vs2010/obj/x32/Debug/LinearMath/LinearMath.log b/res/bullet3-2.83.4/build3/vs2010/obj/x32/Debug/LinearMath/LinearMath.log index a5314a7..655358f 100644 --- a/res/bullet3-2.83.4/build3/vs2010/obj/x32/Debug/LinearMath/LinearMath.log +++ b/res/bullet3-2.83.4/build3/vs2010/obj/x32/Debug/LinearMath/LinearMath.log @@ -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 -- 2.47.3