diff --git a/clang-format-all.sh b/clang-format-all.sh old mode 100644 new mode 100755 diff --git a/examples/ExampleBrowser/OpenGLGuiHelper.cpp b/examples/ExampleBrowser/OpenGLGuiHelper.cpp index 306c4b96b..cb1477b6c 100644 --- a/examples/ExampleBrowser/OpenGLGuiHelper.cpp +++ b/examples/ExampleBrowser/OpenGLGuiHelper.cpp @@ -991,7 +991,7 @@ void OpenGLGuiHelper::setVisualizerFlag(int flag, int enable) getRenderInterface()->setPlaneReflectionShapeIndex(enable); } if (m_data->m_visualizerFlagCallback) - (m_data->m_visualizerFlagCallback)(flag, enable!=0); + (m_data->m_visualizerFlagCallback)(flag, enable != 0); } void OpenGLGuiHelper::resetCamera(float camDist, float yaw, float pitch, float camPosX, float camPosY, float camPosZ) @@ -1071,7 +1071,6 @@ void OpenGLGuiHelper::setProjectiveTexture(bool useProjectiveTexture) m_data->m_glApp->m_renderer->setProjectiveTexture(useProjectiveTexture); } - void OpenGLGuiHelper::copyCameraImageData(const float viewMatrix[16], const float projectionMatrix[16], unsigned char* pixelsRGBA, int rgbaBufferSizeInPixels, float* depthBuffer, int depthBufferSizeInPixels, @@ -1079,8 +1078,6 @@ void OpenGLGuiHelper::copyCameraImageData(const float viewMatrix[16], const floa int startPixelIndex, int destinationWidth, int destinationHeight, int* numPixelsCopied) { - - int sourceWidth = btMin(destinationWidth, (int)(m_data->m_glApp->m_window->getWidth() * m_data->m_glApp->m_window->getRetinaScale())); int sourceHeight = btMin(destinationHeight, (int)(m_data->m_glApp->m_window->getHeight() * m_data->m_glApp->m_window->getRetinaScale())); m_data->m_glApp->setViewport(sourceWidth, sourceHeight); @@ -1104,7 +1101,7 @@ void OpenGLGuiHelper::copyCameraImageData(const float viewMatrix[16], const floa BT_PROFILE("renderScene"); getRenderInterface()->renderScene(); } - + { BT_PROFILE("copy pixels"); btAlignedObjectArray sourceRgbaPixelBuffer; @@ -1164,7 +1161,7 @@ void OpenGLGuiHelper::copyCameraImageData(const float viewMatrix[16], const floa BT_PROFILE("renderScene"); getRenderInterface()->renderSceneInternal(B3_SEGMENTATION_MASK_RENDERMODE); } - + { BT_PROFILE("copy pixels"); btAlignedObjectArray sourceRgbaPixelBuffer; @@ -1176,7 +1173,7 @@ void OpenGLGuiHelper::copyCameraImageData(const float viewMatrix[16], const floa BT_PROFILE("getScreenPixelsSegmentationMask"); m_data->m_glApp->getScreenPixels(&(sourceRgbaPixelBuffer[0]), sourceRgbaPixelBuffer.size(), &sourceDepthBuffer[0], sizeof(float) * sourceDepthBuffer.size()); } - m_data->m_segmentationMaskBuffer.resize(destinationWidth * destinationHeight,-1); + m_data->m_segmentationMaskBuffer.resize(destinationWidth * destinationHeight, -1); //rescale and flip { @@ -1196,11 +1193,12 @@ void OpenGLGuiHelper::copyCameraImageData(const float viewMatrix[16], const floa if (segmentationMaskBuffer) { float depth = sourceDepthBuffer[sourceDepthIndex]; - if (depth<1) + if (depth < 1) { - int segMask = sourceRgbaPixelBuffer[sourcePixelIndex + 0]+256*(sourceRgbaPixelBuffer[sourcePixelIndex + 1])+256*256*(sourceRgbaPixelBuffer[sourcePixelIndex + 2]); + int segMask = sourceRgbaPixelBuffer[sourcePixelIndex + 0] + 256 * (sourceRgbaPixelBuffer[sourcePixelIndex + 1]) + 256 * 256 * (sourceRgbaPixelBuffer[sourcePixelIndex + 2]); m_data->m_segmentationMaskBuffer[i + j * destinationWidth] = segMask; - } else + } + else { m_data->m_segmentationMaskBuffer[i + j * destinationWidth] = -1; } @@ -1211,7 +1209,6 @@ void OpenGLGuiHelper::copyCameraImageData(const float viewMatrix[16], const floa } } - getRenderInterface()->setActiveCamera(oldCam); if (1) @@ -1222,8 +1219,6 @@ void OpenGLGuiHelper::copyCameraImageData(const float viewMatrix[16], const floa getRenderInterface()->updateCamera(dg.upAxis); m_data->m_glApp->m_window->startRendering(); } - - } if (pixelsRGBA) { @@ -1254,8 +1249,8 @@ void OpenGLGuiHelper::copyCameraImageData(const float viewMatrix[16], const floa if (numPixelsCopied) *numPixelsCopied = numRequestedPixels; } - - m_data->m_glApp->setViewport(-1,-1); + + m_data->m_glApp->setViewport(-1, -1); } struct MyConvertPointerSizeT @@ -1346,7 +1341,7 @@ void OpenGLGuiHelper::computeSoftBodyVertices(btCollisionShape* collisionShape, b3Assert(collisionShape->getUserPointer()); btSoftBody* psb = (btSoftBody*)collisionShape->getUserPointer(); gfxVertices.resize(psb->m_faces.size() * 3); - + for (int i = 0; i < psb->m_faces.size(); i++) // Foreach face { for (int k = 0; k < 3; k++) // Foreach vertex on a face diff --git a/examples/OpenGLWindow/SimpleOpenGL3App.cpp b/examples/OpenGLWindow/SimpleOpenGL3App.cpp index 8936beede..baa607bef 100644 --- a/examples/OpenGLWindow/SimpleOpenGL3App.cpp +++ b/examples/OpenGLWindow/SimpleOpenGL3App.cpp @@ -66,23 +66,23 @@ struct SimpleInternalData int m_customViewPortWidth; int m_customViewPortHeight; SimpleInternalData() - :m_fontTextureId(0), - m_largeFontTextureId(0), - m_fontStash(0), - m_fontStash2(0), - m_renderCallbacks(0), - m_renderCallbacks2(0), - m_droidRegular(0), - m_droidRegular2(0), - m_frameDumpPngFileName(0), - m_ffmpegFile(0), - m_renderTexture(0), - m_userPointer(0), - m_upAxis(0), - m_customViewPortWidth(-1), - m_customViewPortHeight(-1) - { - } + : m_fontTextureId(0), + m_largeFontTextureId(0), + m_fontStash(0), + m_fontStash2(0), + m_renderCallbacks(0), + m_renderCallbacks2(0), + m_droidRegular(0), + m_droidRegular2(0), + m_frameDumpPngFileName(0), + m_ffmpegFile(0), + m_renderTexture(0), + m_userPointer(0), + m_upAxis(0), + m_customViewPortWidth(-1), + m_customViewPortHeight(-1) + { + } }; static SimpleOpenGL3App* gApp = 0; @@ -308,7 +308,6 @@ SimpleOpenGL3App::SimpleOpenGL3App(const char* title, int width, int height, boo gApp = this; m_data = new SimpleInternalData; - if (windowType == 0) { @@ -925,24 +924,24 @@ SimpleOpenGL3App::~SimpleOpenGL3App() delete m_data; } - void SimpleOpenGL3App::setViewport(int width, int height) { - m_data->m_customViewPortWidth=width; - m_data->m_customViewPortHeight=height; - if (width>=0) + m_data->m_customViewPortWidth = width; + m_data->m_customViewPortHeight = height; + if (width >= 0) { - glViewport(0,0,width,height); - } else + glViewport(0, 0, width, height); + } + else { - glViewport(0,0,m_window->getRetinaScale()*m_instancingRenderer->getScreenWidth(),m_window->getRetinaScale()*m_instancingRenderer->getScreenHeight()); + glViewport(0, 0, m_window->getRetinaScale() * m_instancingRenderer->getScreenWidth(), m_window->getRetinaScale() * m_instancingRenderer->getScreenHeight()); } } void SimpleOpenGL3App::getScreenPixels(unsigned char* rgbaBuffer, int bufferSizeInBytes, float* depthBuffer, int depthBufferSizeInBytes) { - int width = m_data->m_customViewPortWidth>=0? m_data->m_customViewPortWidth : (int)m_window->getRetinaScale() * m_instancingRenderer->getScreenWidth(); - int height = m_data->m_customViewPortHeight >=0? m_data->m_customViewPortHeight: (int)m_window->getRetinaScale() * m_instancingRenderer->getScreenHeight(); + int width = m_data->m_customViewPortWidth >= 0 ? m_data->m_customViewPortWidth : (int)m_window->getRetinaScale() * m_instancingRenderer->getScreenWidth(); + int height = m_data->m_customViewPortHeight >= 0 ? m_data->m_customViewPortHeight : (int)m_window->getRetinaScale() * m_instancingRenderer->getScreenHeight(); b3Assert((width * height * 4) == bufferSizeInBytes); if ((width * height * 4) == bufferSizeInBytes) diff --git a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp index 29ceabf37..86a2628d5 100644 --- a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp +++ b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp @@ -1726,7 +1726,6 @@ struct PhysicsServerCommandProcessorInternalData } #endif //ENABLE_STATIC_GRPC_PLUGIN - #ifdef STATIC_EGLRENDERER_PLUGIN { bool initPlugin = false; @@ -1735,15 +1734,12 @@ struct PhysicsServerCommandProcessorInternalData } #endif //STATIC_EGLRENDERER_PLUGIN - #ifndef SKIP_STATIC_TINYRENDERER_PLUGIN { int renderPluginId = m_pluginManager.registerStaticLinkedPlugin("tinyRendererPlugin", initPlugin_tinyRendererPlugin, exitPlugin_tinyRendererPlugin, executePluginCommand_tinyRendererPlugin, 0, 0, getRenderInterface_tinyRendererPlugin, 0, 0); m_pluginManager.selectPluginRenderer(renderPluginId); } #endif - - } m_vrControllerEvents.init(); @@ -2743,30 +2739,27 @@ bool PhysicsServerCommandProcessor::processImportedObjects(const char* fileName, if (mb) mb->setUserIndex2(bodyUniqueId); - - if (mb) { bodyHandle->m_multiBody = mb; m_data->m_sdfRecentLoadedBodies.push_back(bodyUniqueId); - int segmentationMask = bodyUniqueId; - + { int graphicsIndex = -1; if (mb->getBaseCollider()) { graphicsIndex = mb->getBaseCollider()->getUserIndex(); } - if (graphicsIndex>=0) + if (graphicsIndex >= 0) { - if (m_data->m_graphicsIndexToSegmentationMask.size()<(graphicsIndex+1)) + if (m_data->m_graphicsIndexToSegmentationMask.size() < (graphicsIndex + 1)) { - m_data->m_graphicsIndexToSegmentationMask.resize(graphicsIndex+1); + m_data->m_graphicsIndexToSegmentationMask.resize(graphicsIndex + 1); } - m_data->m_graphicsIndexToSegmentationMask[graphicsIndex]= segmentationMask; + m_data->m_graphicsIndexToSegmentationMask[graphicsIndex] = segmentationMask; } } @@ -2811,20 +2804,20 @@ bool PhysicsServerCommandProcessor::processImportedObjects(const char* fileName, int graphicsIndex = -1; if (mb->getLinkCollider(i)) { - graphicsIndex = mb->getLinkCollider(i)->getUserIndex(); + graphicsIndex = mb->getLinkCollider(i)->getUserIndex(); } - if (graphicsIndex>=0) + if (graphicsIndex >= 0) { int linkIndex = i; - if (m_data->m_graphicsIndexToSegmentationMask.size()<(graphicsIndex+1)) + if (m_data->m_graphicsIndexToSegmentationMask.size() < (graphicsIndex + 1)) { - m_data->m_graphicsIndexToSegmentationMask.resize(graphicsIndex+1); + m_data->m_graphicsIndexToSegmentationMask.resize(graphicsIndex + 1); } int segmentationMask = bodyUniqueId + ((linkIndex + 1) << 24); - m_data->m_graphicsIndexToSegmentationMask[graphicsIndex]= segmentationMask; + m_data->m_graphicsIndexToSegmentationMask[graphicsIndex] = segmentationMask; } } - + std::string* jointName = new std::string(u2b.getJointName(urdfLinkIndex).c_str()); m_data->m_strings.push_back(jointName); @@ -2860,13 +2853,13 @@ bool PhysicsServerCommandProcessor::processImportedObjects(const char* fileName, { graphicsIndex = rb->getUserIndex(); } - if (graphicsIndex>=0) + if (graphicsIndex >= 0) { - if (m_data->m_graphicsIndexToSegmentationMask.size()<(graphicsIndex+1)) + if (m_data->m_graphicsIndexToSegmentationMask.size() < (graphicsIndex + 1)) { - m_data->m_graphicsIndexToSegmentationMask.resize(graphicsIndex+1); + m_data->m_graphicsIndexToSegmentationMask.resize(graphicsIndex + 1); } - m_data->m_graphicsIndexToSegmentationMask[graphicsIndex]= segmentationMask; + m_data->m_graphicsIndexToSegmentationMask[graphicsIndex] = segmentationMask; } } @@ -3524,9 +3517,9 @@ bool PhysicsServerCommandProcessor::processRequestCameraImageCommand(const struc this->m_data->m_guiHelper->setProjectiveTexture(false); } - if ((flags & (ER_SEGMENTATION_MASK_OBJECT_AND_LINKINDEX + ER_SEGMENTATION_MASK))==0) + if ((flags & (ER_SEGMENTATION_MASK_OBJECT_AND_LINKINDEX + ER_SEGMENTATION_MASK)) == 0) { - segmentationMaskBuffer=0; + segmentationMaskBuffer = 0; } m_data->m_guiHelper->copyCameraImageData(viewMat, projMat, pixelRGBA, numRequestedPixels, @@ -3540,11 +3533,11 @@ bool PhysicsServerCommandProcessor::processRequestCameraImageCommand(const struc if (segmentationMaskBuffer) { - for (int i=0;i= 0) && (graphicsSegMaskm_graphicsIndexToSegmentationMask.size())) + if ((graphicsSegMask >= 0) && (graphicsSegMask < m_data->m_graphicsIndexToSegmentationMask.size())) { segMask = m_data->m_graphicsIndexToSegmentationMask[graphicsSegMask]; } @@ -3557,10 +3550,8 @@ bool PhysicsServerCommandProcessor::processRequestCameraImageCommand(const struc } segmentationMaskBuffer[i] = segMask; } - } - handled = true; m_data->m_guiHelper->debugDisplayCameraImageData(viewMat, projMat, pixelRGBA, numRequestedPixels, @@ -5767,7 +5758,7 @@ bool PhysicsServerCommandProcessor::processSendDesiredStateCommand(const struct } } } //fi - //break; + //break; } } } //if (body && body->m_rigidBody) diff --git a/examples/SharedMemory/SharedMemoryPublic.h b/examples/SharedMemory/SharedMemoryPublic.h index 1cf201627..8078038da 100644 --- a/examples/SharedMemory/SharedMemoryPublic.h +++ b/examples/SharedMemory/SharedMemoryPublic.h @@ -746,7 +746,7 @@ enum EnumRendererAuxFlags { ER_SEGMENTATION_MASK_OBJECT_AND_LINKINDEX = 1, ER_USE_PROJECTIVE_TEXTURE = 2, - ER_SEGMENTATION_MASK=4, + ER_SEGMENTATION_MASK = 4, }; ///flags to pick the IK solver and other options diff --git a/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp b/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp index 3f312a768..fbf4c7e97 100644 --- a/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp +++ b/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp @@ -100,7 +100,6 @@ struct EGLRendererVisualShapeConverterInternalData btAlignedObjectArray m_segmentationMaskSourceRgbaPixelBuffer; btAlignedObjectArray m_segmentationMaskSourceDepthBuffer; - btAlignedObjectArray m_graphicsIndexToSegmentationMask; btHashMap m_swRenderInstances; @@ -795,18 +794,16 @@ void EGLRendererVisualShapeConverter::convertVisualShapes( int segmentationMask = bodyUniqueId + ((linkIndex + 1) << 24); { int graphicsIndex = visuals->m_graphicsInstanceId; - if (graphicsIndex>=0) + if (graphicsIndex >= 0) { - if (m_data->m_graphicsIndexToSegmentationMask.size()<(graphicsIndex+1)) + if (m_data->m_graphicsIndexToSegmentationMask.size() < (graphicsIndex + 1)) { - m_data->m_graphicsIndexToSegmentationMask.resize(graphicsIndex+1); + m_data->m_graphicsIndexToSegmentationMask.resize(graphicsIndex + 1); } - m_data->m_graphicsIndexToSegmentationMask[graphicsIndex]= segmentationMask; + m_data->m_graphicsIndexToSegmentationMask[graphicsIndex] = segmentationMask; } } - - m_data->m_instancingRenderer->writeTransforms(); } } @@ -998,21 +995,18 @@ void EGLRendererVisualShapeConverter::copyCameraImageDataGL( int destinationWidth = *widthPtr; int destinationHeight = *heightPtr; - int sourceWidth = btMin(destinationWidth, (int)( m_data->m_window->getWidth() * m_data->m_window->getRetinaScale())); + int sourceWidth = btMin(destinationWidth, (int)(m_data->m_window->getWidth() * m_data->m_window->getRetinaScale())); int sourceHeight = btMin(destinationHeight, (int)(m_data->m_window->getHeight() * m_data->m_window->getRetinaScale())); - - int numTotalPixels = (*widthPtr) * (*heightPtr); int numRemainingPixels = numTotalPixels - startPixelIndex; int numBytesPerPixel = 4; //RGBA int numRequestedPixels = btMin(rgbaBufferSizeInPixels, numRemainingPixels); if (numRequestedPixels) { - - if (startPixelIndex==0) + if (startPixelIndex == 0) { - glViewport(0,0,sourceWidth,sourceHeight); + glViewport(0, 0, sourceWidth, sourceHeight); m_data->m_window->endRendering(); m_data->m_window->startRendering(); /* @@ -1042,7 +1036,7 @@ void EGLRendererVisualShapeConverter::copyCameraImageDataGL( { { BT_PROFILE("copy pixels"); - + //copy the image into our local cache m_data->m_sourceRgbaPixelBuffer.resize(sourceWidth * sourceHeight * numBytesPerPixel); m_data->m_sourceDepthBuffer.resize(sourceWidth * sourceHeight); @@ -1069,12 +1063,9 @@ void EGLRendererVisualShapeConverter::copyCameraImageDataGL( b3Assert(glstat == GL_NO_ERROR); } } - - } } - m_data->m_rgbaPixelBuffer1.resize((*widthPtr) * (*heightPtr) * numBytesPerPixel); m_data->m_depthBuffer1.resize((*widthPtr) * (*heightPtr)); //rescale and flip @@ -1116,14 +1107,14 @@ void EGLRendererVisualShapeConverter::copyCameraImageDataGL( { { m_data->m_window->startRendering(); - + BT_PROFILE("renderScene"); m_data->m_instancingRenderer->renderSceneInternal(B3_SEGMENTATION_MASK_RENDERMODE); } { BT_PROFILE("copy pixels"); - + //copy the image into our local cache m_data->m_segmentationMaskSourceRgbaPixelBuffer.resize(sourceWidth * sourceHeight * numBytesPerPixel); m_data->m_segmentationMaskSourceDepthBuffer.resize(sourceWidth * sourceHeight); @@ -1141,14 +1132,11 @@ void EGLRendererVisualShapeConverter::copyCameraImageDataGL( glstat = glGetError(); b3Assert(glstat == GL_NO_ERROR); } - - } } } - - m_data->m_segmentationMaskBuffer.resize(destinationWidth * destinationHeight,-1); + m_data->m_segmentationMaskBuffer.resize(destinationWidth * destinationHeight, -1); //rescale and flip { @@ -1168,11 +1156,12 @@ void EGLRendererVisualShapeConverter::copyCameraImageDataGL( if (segmentationMaskBuffer) { float depth = m_data->m_segmentationMaskSourceDepthBuffer[sourceDepthIndex]; - if (depth<1) + if (depth < 1) { - int segMask = m_data->m_segmentationMaskSourceRgbaPixelBuffer[sourcePixelIndex + 0]+256*(m_data->m_segmentationMaskSourceRgbaPixelBuffer[sourcePixelIndex + 1])+256*256*(m_data->m_segmentationMaskSourceRgbaPixelBuffer[sourcePixelIndex + 2]); + int segMask = m_data->m_segmentationMaskSourceRgbaPixelBuffer[sourcePixelIndex + 0] + 256 * (m_data->m_segmentationMaskSourceRgbaPixelBuffer[sourcePixelIndex + 1]) + 256 * 256 * (m_data->m_segmentationMaskSourceRgbaPixelBuffer[sourcePixelIndex + 2]); m_data->m_segmentationMaskBuffer[i + j * destinationWidth] = segMask; - } else + } + else { m_data->m_segmentationMaskBuffer[i + j * destinationWidth] = -1; } @@ -1180,8 +1169,7 @@ void EGLRendererVisualShapeConverter::copyCameraImageDataGL( } } } - glViewport(0,0,m_data->m_window->getWidth() * m_data->m_window->getRetinaScale(),m_data->m_window->getHeight() * m_data->m_window->getRetinaScale()); - + glViewport(0, 0, m_data->m_window->getWidth() * m_data->m_window->getRetinaScale(), m_data->m_window->getHeight() * m_data->m_window->getRetinaScale()); } if (pixelsRGBA) { @@ -1204,10 +1192,9 @@ void EGLRendererVisualShapeConverter::copyCameraImageDataGL( BT_PROFILE("copy segmentation mask buffer pixels"); for (int i = 0; i < numRequestedPixels; i++) { - int graphicsIndexSegMask = m_data->m_segmentationMaskBuffer[i + startPixelIndex]; int segMask = -1; - if (graphicsIndexSegMask>=0 && graphicsIndexSegMask< m_data->m_graphicsIndexToSegmentationMask.size()) + if (graphicsIndexSegMask >= 0 && graphicsIndexSegMask < m_data->m_graphicsIndexToSegmentationMask.size()) { segMask = m_data->m_graphicsIndexToSegmentationMask[graphicsIndexSegMask]; } @@ -1227,8 +1214,6 @@ void EGLRendererVisualShapeConverter::copyCameraImageDataGL( *numPixelsCopied = numRequestedPixels; } } - - } void EGLRendererVisualShapeConverter::copyCameraImageData(unsigned char* pixelsRGBA, int rgbaBufferSizeInPixels, diff --git a/examples/ThirdPartyLibs/imgui/stb_truetype.h b/examples/ThirdPartyLibs/imgui/stb_truetype.h index 60597d2a2..2e8b093bb 100644 --- a/examples/ThirdPartyLibs/imgui/stb_truetype.h +++ b/examples/ThirdPartyLibs/imgui/stb_truetype.h @@ -799,7 +799,7 @@ extern "C" }; #endif -#ifndef stbtt_vertex // you can predefine this to use different values +#ifndef stbtt_vertex // you can predefine this to use different values \ // (we share this with other code at RAD) #define stbtt_vertex_type short // can't use stbtt_int16 because that's not visible in the header file typedef struct diff --git a/examples/ThirdPartyLibs/lua-5.2.3/src/lstrlib.c b/examples/ThirdPartyLibs/lua-5.2.3/src/lstrlib.c index 899719819..89f5a3f4d 100644 --- a/examples/ThirdPartyLibs/lua-5.2.3/src/lstrlib.c +++ b/examples/ThirdPartyLibs/lua-5.2.3/src/lstrlib.c @@ -576,7 +576,7 @@ init: /* using goto's to optimize tail recursion */ } case '+': /* 1 or more repetitions */ s++; /* 1 match already done */ - /* go through */ + /* go through */ case '*': /* 0 or more repetitions */ s = max_expand(ms, s, p, ep); break; diff --git a/examples/ThirdPartyLibs/stb_image/stb_truetype.h b/examples/ThirdPartyLibs/stb_image/stb_truetype.h index c2758c947..4d84eb172 100644 --- a/examples/ThirdPartyLibs/stb_image/stb_truetype.h +++ b/examples/ThirdPartyLibs/stb_image/stb_truetype.h @@ -707,7 +707,7 @@ extern "C" }; #endif -#ifndef stbtt_vertex // you can predefine this to use different values +#ifndef stbtt_vertex // you can predefine this to use different values \ // (we share this with other code at RAD) #define stbtt_vertex_type short // can't use stbtt_int16 because that's not visible in the header file typedef struct diff --git a/src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.cpp b/src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.cpp index db9030f66..4126d03ed 100644 --- a/src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.cpp +++ b/src/Bullet3OpenCL/BroadphaseCollision/b3GpuSapBroadphase.cpp @@ -1227,7 +1227,7 @@ void b3GpuSapBroadphase::calculateOverlappingPairs(int maxPairs) m_overlappingPairs.resize(numPairs); } //B3_PROFILE("GPU_RADIX SORT"); - //init3dSap(); + //init3dSap(); } void b3GpuSapBroadphase::writeAabbsToGpu() diff --git a/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp b/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp index 8f81de9d1..9f422dc15 100644 --- a/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp +++ b/src/BulletCollision/CollisionDispatch/btCollisionWorldImporter.cpp @@ -292,9 +292,9 @@ btCollisionShape* btCollisionWorldImporter::convertCollisionShape(btCollisionSha } break; } -#endif //SUPPORT_GIMPACT_SHAPE_IMPORT - //The btCapsuleShape* API has issue passing the margin/scaling/halfextents unmodified through the API - //so deal with this +#endif //SUPPORT_GIMPACT_SHAPE_IMPORT \ + //The btCapsuleShape* API has issue passing the margin/scaling/halfextents unmodified through the API \ + //so deal with this case CAPSULE_SHAPE_PROXYTYPE: { btCapsuleShapeData* capData = (btCapsuleShapeData*)shapeData; diff --git a/src/BulletCollision/Gimpact/gim_linear_math.h b/src/BulletCollision/Gimpact/gim_linear_math.h index 70a1b508f..98401a404 100644 --- a/src/BulletCollision/Gimpact/gim_linear_math.h +++ b/src/BulletCollision/Gimpact/gim_linear_math.h @@ -967,7 +967,7 @@ Last column is added as the position GREAL len; \ \ /* do nothing if off-diagonals are zero and diagonals are \ - * equal */ \ + * equal */ \ if ((m[0][1] != 0.0) || (m[1][0] != 0.0) || (m[0][0] != m[1][1])) \ { \ p[0] = m[1][1] * v[0] - m[1][0] * v[1]; \ diff --git a/src/BulletSoftBody/btSparseSDF.h b/src/BulletSoftBody/btSparseSDF.h index 11a693631..a52b2cb1c 100644 --- a/src/BulletSoftBody/btSparseSDF.h +++ b/src/BulletSoftBody/btSparseSDF.h @@ -139,7 +139,7 @@ struct btSparseSdf nqueries = 1; nprobes = 1; ++puid; ///@todo: Reset puid's when int range limit is reached */ - /* else setup a priority list... */ + /* else setup a priority list... */ } // int RemoveReferences(btCollisionShape* pcs) diff --git a/test/GwenOpenGLTest/OpenGLSample.cpp b/test/GwenOpenGLTest/OpenGLSample.cpp index 3328f0b89..50048e0f8 100644 --- a/test/GwenOpenGLTest/OpenGLSample.cpp +++ b/test/GwenOpenGLTest/OpenGLSample.cpp @@ -347,8 +347,8 @@ int main() #endif // _WIN32 gladLoaderLoadGL(); #endif -#endif //B3_USE_GLFW - //we ned to call glGetError twice, because of some Ubuntu/Intel/OpenGL issue +#endif //B3_USE_GLFW \ + //we ned to call glGetError twice, because of some Ubuntu/Intel/OpenGL issue GLuint err = glGetError(); err = glGetError(); diff --git a/test/gtest-1.7.0/src/gtest.cc b/test/gtest-1.7.0/src/gtest.cc index d19a97fc7..e5f294f72 100644 --- a/test/gtest-1.7.0/src/gtest.cc +++ b/test/gtest-1.7.0/src/gtest.cc @@ -4428,7 +4428,7 @@ UnitTestImpl::UnitTestImpl(UnitTest* parent) : parent_(parent), #ifdef _MSC_VER #pragma warning(push) // Saves the current warning state. -#pragma warning(disable : 4355) // Temporarily disables warning 4355 +#pragma warning(disable : 4355) // Temporarily disables warning 4355 \ // (using this in initializer). default_global_test_part_result_reporter_(this), default_per_thread_test_part_result_reporter_(this),