diff --git a/Extras/GIMPACT/include/GIMPACT/core/gim_memory.h b/Extras/GIMPACT/include/GIMPACT/core/gim_memory.h index 8e654bdcf..d00191c55 100755 --- a/Extras/GIMPACT/include/GIMPACT/core/gim_memory.h +++ b/Extras/GIMPACT/include/GIMPACT/core/gim_memory.h @@ -151,6 +151,8 @@ void gim_free(void *ptr); inline void gim_simd_memcpy(void * dst, const void * src, size_t copysize) { #ifdef GIM_SIMD_MEMORY +/* +//'long long int' is incompatible with visual studio 6... //copy words SIMD_T * ui_src_ptr = (SIMD_T *)src; SIMD_T * ui_dst_ptr = (SIMD_T *)dst; @@ -160,9 +162,10 @@ inline void gim_simd_memcpy(void * dst, const void * src, size_t copysize) copysize-=SIMD_T_SIZE; } if(copysize==0) return; +*/ - char * c_src_ptr = (char *)ui_src_ptr; - char * c_dst_ptr = (char *)ui_dst_ptr; + char * c_src_ptr = (char *)src; + char * c_dst_ptr = (char *)dst; while(copysize>0) { *(c_dst_ptr++) = *(c_src_ptr++); diff --git a/Extras/GIMPACT/include/GIMPACT/core/gim_tri_collision.h b/Extras/GIMPACT/include/GIMPACT/core/gim_tri_collision.h index dba6f742c..6bdc333d4 100755 --- a/Extras/GIMPACT/include/GIMPACT/core/gim_tri_collision.h +++ b/Extras/GIMPACT/include/GIMPACT/core/gim_tri_collision.h @@ -86,7 +86,9 @@ struct GIM_TRIANGLE_CONTACT_DATA GUINT point_indices[MAX_TRI_CLIPPING]; - for(GUINT _k=0;_kregisterCollisionCreateFunc(GIMPACT_SHAPE_PROXYTYPE,i ,&g_gimpact_cf); } - for (int i = 0;i < MAX_BROADPHASE_COLLISION_TYPES ;i++ ) + for ( i = 0;i < MAX_BROADPHASE_COLLISION_TYPES ;i++ ) { dispatcher->registerCollisionCreateFunc(i,GIMPACT_SHAPE_PROXYTYPE ,&g_gimpact_cf); } diff --git a/Extras/GIMPACT/src/Bullet/btTriangleShapeEx.cpp b/Extras/GIMPACT/src/Bullet/btTriangleShapeEx.cpp index 58f38b6bf..7be6bee75 100644 --- a/Extras/GIMPACT/src/Bullet/btTriangleShapeEx.cpp +++ b/Extras/GIMPACT/src/Bullet/btTriangleShapeEx.cpp @@ -33,7 +33,9 @@ void BT_TRIANGLE_CONTACT::merge_points(const btVector4 & plane, int point_indices[MAX_TRI_CLIPPING]; - for (int _k=0;_k