Author: mp3butcher
Date: Wed Jan 21 14:09:31 2015
New Revision: 568
URL: http://svn.gna.org/viewcvs/cal3d?rev=568&view=rev
Log:
comment out unused code
+minor update
Added:
trunk/cal3d/Win32GlutAndGlew/glut64.dll (with props)
Modified:
trunk/cal3d/examples/miniviewer_gl/src/CMakeLists.txt
trunk/cal3d/examples/miniviewer_gl_vp/src/CMakeLists.txt
trunk/cal3d/examples/miniviewer_gl_vp/src/viewer.cpp
trunk/cal3d/src/cal3d/coremesh.cpp
trunk/cal3d/src/cal3d/loader.cpp
trunk/cal3d/src/cal3d/physique.cpp
trunk/cal3d/src/cal3d/saver.cpp
Added: trunk/cal3d/Win32GlutAndGlew/glut64.dll
URL:
http://svn.gna.org/viewcvs/cal3d/trunk/cal3d/Win32GlutAndGlew/glut64.dll?rev=568&view=auto
==============================================================================
Binary file - no diff available.
Propchange: trunk/cal3d/Win32GlutAndGlew/glut64.dll
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: trunk/cal3d/examples/miniviewer_gl/src/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/cal3d/trunk/cal3d/examples/miniviewer_gl/src/CMakeLists.txt?rev=568&r1=567&r2=568&view=diff
==============================================================================
--- trunk/cal3d/examples/miniviewer_gl/src/CMakeLists.txt (original)
+++ trunk/cal3d/examples/miniviewer_gl/src/CMakeLists.txt Wed Jan 21
14:09:31 2015
@@ -13,7 +13,7 @@
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} )
-
+INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_PATH})
INCLUDE_DIRECTORIES( ${CMAKE_HOME_DIRECTORY}/src)
SET(PROJECT_SOURCES
Modified: trunk/cal3d/examples/miniviewer_gl_vp/src/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/cal3d/trunk/cal3d/examples/miniviewer_gl_vp/src/CMakeLists.txt?rev=568&r1=567&r2=568&view=diff
==============================================================================
--- trunk/cal3d/examples/miniviewer_gl_vp/src/CMakeLists.txt (original)
+++ trunk/cal3d/examples/miniviewer_gl_vp/src/CMakeLists.txt Wed Jan 21
14:09:31 2015
@@ -14,7 +14,8 @@
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} "./" )
-
+include_directories(${GLEW_INCLUDE_PATH})
+INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_PATH})
INCLUDE_DIRECTORIES( ${CMAKE_HOME_DIRECTORY}/src)
SET(PROJECT_SOURCES
@@ -23,8 +24,7 @@
)
-include_directories(${GLEW_INCLUDE_PATH})
-INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_PATH})
+
IF(WIN32)
Modified: trunk/cal3d/examples/miniviewer_gl_vp/src/viewer.cpp
URL:
http://svn.gna.org/viewcvs/cal3d/trunk/cal3d/examples/miniviewer_gl_vp/src/viewer.cpp?rev=568&r1=567&r2=568&view=diff
==============================================================================
--- trunk/cal3d/examples/miniviewer_gl_vp/src/viewer.cpp (original)
+++ trunk/cal3d/examples/miniviewer_gl_vp/src/viewer.cpp Wed Jan 21
14:09:31 2015
@@ -571,12 +571,12 @@
bool Viewer::loadBufferObject()
{
- float *pVertexBuffer = (float*)malloc(30000*3*sizeof(float));
- float *pWeightBuffer = (float*)malloc(30000*4*sizeof(float));
+ float *pVertexBuffer = (float*)malloc(300000*3*sizeof(float));
+ float *pWeightBuffer = (float*)malloc(300000*4*sizeof(float));
float *pMatrixIndexBuffer = (float*)malloc(30000*4*sizeof(float));
- float *pNormalBuffer = (float*)malloc(30000*3*sizeof(float));
- float *pTexCoordBuffer = (float*)malloc(30000*2*sizeof(float));
- CalIndex *pIndexBuffer = (CalIndex*)malloc(50000*3*sizeof(CalIndex));
+ float *pNormalBuffer = (float*)malloc(300000*3*sizeof(float));
+ float *pTexCoordBuffer = (float*)malloc(300000*2*sizeof(float));
+ CalIndex *pIndexBuffer = (CalIndex*)malloc(500000*3*sizeof(CalIndex));
if(pVertexBuffer==NULL || pWeightBuffer == NULL
|| pMatrixIndexBuffer==NULL || pNormalBuffer == NULL
Modified: trunk/cal3d/src/cal3d/coremesh.cpp
URL:
http://svn.gna.org/viewcvs/cal3d/trunk/cal3d/src/cal3d/coremesh.cpp?rev=568&r1=567&r2=568&view=diff
==============================================================================
--- trunk/cal3d/src/cal3d/coremesh.cpp (original)
+++ trunk/cal3d/src/cal3d/coremesh.cpp Wed Jan 21 14:09:31 2015
@@ -203,8 +203,8 @@
{
//Check if the numbers of vertices allow a blending
std::vector<CalCoreSubmesh *>& otherVectorCoreSubmesh =
pCoreMesh->getVectorCoreSubmesh();
- int numsubs = getCoreSubmeshCount();
- int othernumsubs = pCoreMesh->getCoreSubmeshCount();
+ //int numsubs = getCoreSubmeshCount();
+ //int othernumsubs = pCoreMesh->getCoreSubmeshCount();
if (m_vectorCoreSubmesh.size() != otherVectorCoreSubmesh.size())
{
CalError::setLastError(CalError::INTERNAL, __FILE__, __LINE__, "This mesh
has children with a different numbers of submeshes");
Modified: trunk/cal3d/src/cal3d/loader.cpp
URL:
http://svn.gna.org/viewcvs/cal3d/trunk/cal3d/src/cal3d/loader.cpp?rev=568&r1=567&r2=568&view=diff
==============================================================================
--- trunk/cal3d/src/cal3d/loader.cpp (original)
+++ trunk/cal3d/src/cal3d/loader.cpp Wed Jan 21 14:09:31 2015
@@ -927,8 +927,8 @@
return 0;
}
- bool hasVertexColors = (version >=
Cal::FIRST_FILE_VERSION_WITH_VERTEX_COLORS);
- bool hasMorphTargetsInMorphFiles = (version >=
Cal::FIRST_FILE_VERSION_WITH_MORPH_TARGETS_IN_MORPH_FILES);
+ //bool hasVertexColors = (version >=
Cal::FIRST_FILE_VERSION_WITH_VERTEX_COLORS);
+ //bool hasMorphTargetsInMorphFiles = (version >=
Cal::FIRST_FILE_VERSION_WITH_MORPH_TARGETS_IN_MORPH_FILES);
// get the number of submeshes
int submeshCount;
@@ -1480,9 +1480,9 @@
// Read in the quat and time.
float quat[ 4 ];
unsigned int steps;
- unsigned int bytesRead = ReadQuatAndExtra( buf, quat, & steps,
keyframeBitsPerOriComponent, keyframeBitsPerTime );
+ // unsigned int bytesRead = ReadQuatAndExtra( buf, quat, & steps,
keyframeBitsPerOriComponent, keyframeBitsPerTime );
buf += 6;
- assert( bytesRead == 6 );
+// assert( bytesRead == 6 );
quatResult->set( quat[ 0 ], quat[ 1 ], quat[ 2 ], quat[ 3 ] );
* timeResult = steps / 30.0f;
return buf - bufStart;
@@ -1546,21 +1546,21 @@
}
// Write the quat and time.
- float wquat[] = { rotation.x, rotation.y, rotation.z, rotation.w };
-
- unsigned int steps = ( unsigned int ) floor( caltime * 30 + 0.5 );
-
- /*
+ /* float wquat[] = { rotation.x, rotation.y, rotation.z, rotation.w };
+
+ unsigned int steps = ( unsigned int ) floor( caltime * 30 + 0.5 );
+
+
Removed the animation time limit so Matt can do his ice skating room.
if( steps >= keyframeTimeMax ) {
CalError::setLastError(CalError::FILE_WRITING_FAILED, __FILE__, __LINE__,
strFilename);
return 0;
}
- */
+
unsigned int bw = WriteQuatAndExtra( buf, wquat, steps,
CalLoader::keyframeBitsPerOriComponent, CalLoader::keyframeBitsPerTime );
- assert( bw == 6 );
+ assert( bw == 6 );*/
buf += 6;
bytesWritten += 6;
return bytesWritten;
Modified: trunk/cal3d/src/cal3d/physique.cpp
URL:
http://svn.gna.org/viewcvs/cal3d/trunk/cal3d/src/cal3d/physique.cpp?rev=568&r1=567&r2=568&view=diff
==============================================================================
--- trunk/cal3d/src/cal3d/physique.cpp (original)
+++ trunk/cal3d/src/cal3d/physique.cpp Wed Jan 21 14:09:31 2015
@@ -623,7 +623,7 @@
// get bone vector of the skeleton
std::vector<CalBone *>& vectorBone =
m_pModel->getSkeleton()->getVectorBone();
- CalBone ** vectorBonePtr = &vectorBone[0];
+ // CalBone ** vectorBonePtr = &vectorBone[0];
// get vertex vector of the core submesh
CalCoreSubmesh::Vertex* vectorVertex =
&pSubmesh->getCoreSubmesh()->getVectorVertex()[0];
Modified: trunk/cal3d/src/cal3d/saver.cpp
URL:
http://svn.gna.org/viewcvs/cal3d/trunk/cal3d/src/cal3d/saver.cpp?rev=568&r1=567&r2=568&view=diff
==============================================================================
--- trunk/cal3d/src/cal3d/saver.cpp (original)
+++ trunk/cal3d/src/cal3d/saver.cpp Wed Jan 21 14:09:31 2015
@@ -932,7 +932,7 @@
CalVector positionDiff = bv->position - Vertex.position;
CalVector normalDiff = bv->normal - Vertex.normal;
double positionDiffLength = fabs(positionDiff.length());
- double normalDiffLength = fabs(normalDiff.length());
+ // double normalDiffLength = fabs(normalDiff.length());
bool skip = false;
// if( positionDiffLength < differenceTolerance &&
normalDiffLength < differenceTolerance ) {
@@ -1728,7 +1728,7 @@
CalVector positionDiff = bv->position - Vertex.position;
CalVector normalDiff = bv->normal - Vertex.normal;
double positionDiffLength = fabs(positionDiff.length());
- double normalDiffLength = fabs(normalDiff.length());
+ // double normalDiffLength = fabs(normalDiff.length());
bool skip = false;
// if( positionDiffLength < differenceTolerance
&& normalDiffLength < differenceTolerance ) {
_______________________________________________
Cal3d-commits mailing list
[email protected]
https://mail.gna.org/listinfo/cal3d-commits
