From 105b2bdeaf554c9f711c8a1a55ebb625f96a4dd7 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Lortie Date: Sat, 4 Apr 2020 15:37:50 -0400 Subject: [PATCH 1/9] Replaced NULL with nullptr for pointers in sample SimpleTexturedDirectx11. --- .../SimpleTexturedDirectx11/ModelLoader.cpp | 2 +- .../SimpleTexturedDirectx11/main.cpp | 38 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/ModelLoader.cpp b/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/ModelLoader.cpp index c8f86bbec..733d3d620 100644 --- a/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/ModelLoader.cpp +++ b/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/ModelLoader.cpp @@ -22,7 +22,7 @@ bool ModelLoader::Load(HWND hwnd, ID3D11Device * dev, ID3D11DeviceContext * devc aiProcess_Triangulate | aiProcess_ConvertToLeftHanded); - if (pScene == NULL) + if (pScene == nullptr) return false; this->directory_ = filename.substr(0, filename.find_last_of("/\\")); diff --git a/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/main.cpp b/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/main.cpp index 1ef4a401f..90338105e 100644 --- a/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/main.cpp +++ b/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/main.cpp @@ -126,7 +126,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, int argc; LPWSTR* argv = CommandLineToArgvW(GetCommandLineW(), &argc); if (!argv) { - MessageBox(NULL, + MessageBox(nullptr, TEXT("An error occured while reading command line arguments."), TEXT("Error!"), MB_ICONERROR | MB_OK); @@ -143,7 +143,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, // Ensure that a model file has been specified. if (argc < 2) { - MessageBox(NULL, + MessageBox(nullptr, TEXT("No model file specified. The program will now close."), TEXT("Error!"), MB_ICONERROR | MB_OK); @@ -165,16 +165,16 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = hInstance; - wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); - wc.hCursor = LoadCursor(NULL, IDC_ARROW); - wc.hbrBackground = NULL; - wc.lpszMenuName = NULL; + wc.hIcon = LoadIcon(nullptr, IDI_APPLICATION); + wc.hCursor = LoadCursor(nullptr, IDC_ARROW); + wc.hbrBackground = nullptr; + wc.lpszMenuName = nullptr; wc.lpszClassName = g_szClassName; - wc.hIconSm = LoadIcon(NULL, IDI_APPLICATION); + wc.hIconSm = LoadIcon(nullptr, IDI_APPLICATION); if (!RegisterClassEx(&wc)) { - MessageBox(NULL, "Window Registration Failed!", "Error!", + MessageBox(nullptr, "Window Registration Failed!", "Error!", MB_ICONEXCLAMATION | MB_OK); return 0; } @@ -188,12 +188,12 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, " Simple Textured Directx11 Sample ", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, wr.right - wr.left, wr.bottom - wr.top, - NULL, NULL, hInstance, NULL + nullptr, nullptr, hInstance, nullptr ); - if (g_hwnd == NULL) + if (g_hwnd == nullptr) { - MessageBox(NULL, "Window Creation Failed!", "Error!", + MessageBox(nullptr, "Window Creation Failed!", "Error!", MB_ICONEXCLAMATION | MB_OK); return 0; } @@ -210,7 +210,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, while (true) { - if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + if (PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); DispatchMessage(&msg); @@ -372,7 +372,7 @@ void InitD3D(HINSTANCE /*hinstance*/, HWND hWnd) ID3D11Texture2D *pBackBuffer; swapchain->GetBuffer(0, __uuidof(ID3D11Texture2D), (LPVOID*)&pBackBuffer); - dev->CreateRenderTargetView(pBackBuffer, NULL, &backbuffer); + dev->CreateRenderTargetView(pBackBuffer, nullptr, &backbuffer); pBackBuffer->Release(); D3D11_TEXTURE2D_DESC descDepth; @@ -440,7 +440,7 @@ void InitD3D(HINSTANCE /*hinstance*/, HWND hWnd) void CleanD3D(void) { if (swapchain) - swapchain->SetFullscreenState(FALSE, NULL); + swapchain->SetFullscreenState(FALSE, nullptr); if (ourModel) { ourModel->Close(); @@ -513,8 +513,8 @@ void InitPipeline() if(FAILED(CompileShaderFromFile(SHADER_PATH PIXEL_SHADER_FILE, 0, "main", "ps_4_0", &PS))) Throwanerror(UTFConverter(L"Failed to compile shader from file " PIXEL_SHADER_FILE).c_str()); - dev->CreateVertexShader(VS->GetBufferPointer(), VS->GetBufferSize(), NULL, &pVS); - dev->CreatePixelShader(PS->GetBufferPointer(), PS->GetBufferSize(), NULL, &pPS); + dev->CreateVertexShader(VS->GetBufferPointer(), VS->GetBufferSize(), nullptr, &pVS); + dev->CreatePixelShader(PS->GetBufferPointer(), PS->GetBufferSize(), nullptr, &pPS); D3D11_INPUT_ELEMENT_DESC ied[] = { @@ -576,16 +576,16 @@ HRESULT CompileShaderFromFile(LPCWSTR pFileName, const D3D_SHADER_MACRO* pDefine compileFlags |= D3DCOMPILE_DEBUG; #endif - ID3DBlob* pErrorBlob = NULL; + ID3DBlob* pErrorBlob = nullptr; HRESULT result = D3DCompileFromFile(pFileName, pDefines, D3D_COMPILE_STANDARD_FILE_INCLUDE, pEntryPoint, pShaderModel, compileFlags, 0, ppBytecodeBlob, &pErrorBlob); if (FAILED(result)) { - if (pErrorBlob != NULL) + if (pErrorBlob != nullptr) OutputDebugStringA((LPCSTR)pErrorBlob->GetBufferPointer()); } - if (pErrorBlob != NULL) + if (pErrorBlob != nullptr) pErrorBlob->Release(); return result; From 3154cec79cb3c53d3bd491bad2243a8d9646cc36 Mon Sep 17 00:00:00 2001 From: Hehongyuanlove <51571751+Hehongyuanlove@users.noreply.github.com> Date: Fri, 17 Apr 2020 12:31:07 +0800 Subject: [PATCH 2/9] Rgba2Hex add --- include/assimp/StringUtils.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/assimp/StringUtils.h b/include/assimp/StringUtils.h index 894eada60..a22876896 100644 --- a/include/assimp/StringUtils.h +++ b/include/assimp/StringUtils.h @@ -145,4 +145,22 @@ std::string DecimalToHexa( T toConvert ) { return result; } +/// @fn Rgba2Hex +/// @brief translate RGBA to String +/// @param r aiColor.r +/// @param g aiColor.g +/// @param b aiColor.b +/// @param a aiColor.a +/// @param with_head # +/// @return The hexadecimal string, is empty in case of an error. +AI_FORCE_INLINE +std::string Rgba2Hex(int r, int g, int b, int a, bool with_head) +{ + std::stringstream ss; + if (with_head) + ss << "#"; + ss << std::hex << (r << 24 | g << 16 | b << 8 | a); + return ss.str(); +} + #endif // INCLUDED_AI_STRINGUTILS_H From 3bbc8e76bda5fa144da63db80774a0f2a7681db3 Mon Sep 17 00:00:00 2001 From: Hehongyuanlove <51571751+Hehongyuanlove@users.noreply.github.com> Date: Fri, 17 Apr 2020 12:34:05 +0800 Subject: [PATCH 3/9] Rgba2Hex to repair rgba(1,1,1,1) --- code/3MF/D3MFExporter.cpp | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/code/3MF/D3MFExporter.cpp b/code/3MF/D3MFExporter.cpp index 092b947e9..b9172f63e 100644 --- a/code/3MF/D3MFExporter.cpp +++ b/code/3MF/D3MFExporter.cpp @@ -254,16 +254,28 @@ void D3MFExporter::writeBaseMaterials() { if ( mat->Get( AI_MATKEY_COLOR_DIFFUSE, color ) == aiReturn_SUCCESS ) { hexDiffuseColor.clear(); tmp.clear(); - hexDiffuseColor = "#"; - - tmp = DecimalToHexa( (ai_real) color.r ); - hexDiffuseColor += tmp; - tmp = DecimalToHexa((ai_real)color.g); - hexDiffuseColor += tmp; - tmp = DecimalToHexa((ai_real)color.b); - hexDiffuseColor += tmp; - tmp = DecimalToHexa((ai_real)color.a); - hexDiffuseColor += tmp; + // rgbs % + if(color.r <= 1 && color.g <= 1 && color.b <= 1 && color.a <= 1){ + + hexDiffuseColor = Rgba2Hex( + ((ai_real)color.r)*255, + ((ai_real)color.g)*255, + ((ai_real)color.b)*255, + ((ai_real)color.a)*255, + true + ); + + }else{ + hexDiffuseColor = "#"; + tmp = DecimalToHexa( (ai_real) color.r ); + hexDiffuseColor += tmp; + tmp = DecimalToHexa((ai_real)color.g); + hexDiffuseColor += tmp; + tmp = DecimalToHexa((ai_real)color.b); + hexDiffuseColor += tmp; + tmp = DecimalToHexa((ai_real)color.a); + hexDiffuseColor += tmp; + } } else { hexDiffuseColor = "#FFFFFFFF"; } From e9a72a505390ae76cc8506e575e6b8ffad295be1 Mon Sep 17 00:00:00 2001 From: Hehongyuanlove <51571751+Hehongyuanlove@users.noreply.github.com> Date: Fri, 17 Apr 2020 12:38:07 +0800 Subject: [PATCH 4/9] repair formate 3MF --- code/3MF/D3MFExporter.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/3MF/D3MFExporter.cpp b/code/3MF/D3MFExporter.cpp index b9172f63e..725992207 100644 --- a/code/3MF/D3MFExporter.cpp +++ b/code/3MF/D3MFExporter.cpp @@ -181,7 +181,7 @@ bool D3MFExporter::export3DModel() { writeHeader(); mModelOutput << "<" << XmlTag::model << " " << XmlTag::model_unit << "=\"millimeter\"" - << "xmlns=\"http://schemas.microsoft.com/3dmanufacturing/core/2015/02\">" + << " xmlns=\"http://schemas.microsoft.com/3dmanufacturing/core/2015/02\">" << std::endl; mModelOutput << "<" << XmlTag::resources << ">"; mModelOutput << std::endl; @@ -212,7 +212,7 @@ bool D3MFExporter::export3DModel() { } void D3MFExporter::writeHeader() { - mModelOutput << ""; + mModelOutput << ""; mModelOutput << std::endl; } @@ -296,7 +296,7 @@ void D3MFExporter::writeObjects() { if ( nullptr == currentNode ) { continue; } - mModelOutput << "<" << XmlTag::object << " id=\"" << currentNode->mName.C_Str() << "\" type=\"model\">"; + mModelOutput << "<" << XmlTag::object << " id=\"" << i + 2 << "\" type=\"model\">"; mModelOutput << std::endl; for ( unsigned int j = 0; j < currentNode->mNumMeshes; ++j ) { aiMesh *currentMesh = mScene->mMeshes[ currentNode->mMeshes[ j ] ]; @@ -360,7 +360,7 @@ void D3MFExporter::writeBuild() { mModelOutput << "<" << XmlTag::build << ">" << std::endl; for ( size_t i = 0; i < mBuildItems.size(); ++i ) { - mModelOutput << "<" << XmlTag::item << " objectid=\"" << i + 1 << "\"/>"; + mModelOutput << "<" << XmlTag::item << " objectid=\"" << i + 2 << "\"/>"; mModelOutput << std::endl; } mModelOutput << ""; From cc3760aff1bad61183bf5412ab1f4fe0d9b8e8e2 Mon Sep 17 00:00:00 2001 From: Hehongyuanlove <51571751+Hehongyuanlove@users.noreply.github.com> Date: Fri, 17 Apr 2020 12:50:49 +0800 Subject: [PATCH 5/9] Update StringUtils.h --- include/assimp/StringUtils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/assimp/StringUtils.h b/include/assimp/StringUtils.h index a22876896..ccded24bf 100644 --- a/include/assimp/StringUtils.h +++ b/include/assimp/StringUtils.h @@ -154,7 +154,7 @@ std::string DecimalToHexa( T toConvert ) { /// @param with_head # /// @return The hexadecimal string, is empty in case of an error. AI_FORCE_INLINE -std::string Rgba2Hex(int r, int g, int b, int a, bool with_head) +std::string Rgba2Hex(floatr, float g, float b, float a, bool with_head) { std::stringstream ss; if (with_head) From 59e32a5ad97a24a0bf79140d260c8e1e63599194 Mon Sep 17 00:00:00 2001 From: Hehongyuanlove <51571751+Hehongyuanlove@users.noreply.github.com> Date: Fri, 17 Apr 2020 12:51:18 +0800 Subject: [PATCH 6/9] Update StringUtils.h --- include/assimp/StringUtils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/assimp/StringUtils.h b/include/assimp/StringUtils.h index ccded24bf..b057b1a9d 100644 --- a/include/assimp/StringUtils.h +++ b/include/assimp/StringUtils.h @@ -154,7 +154,7 @@ std::string DecimalToHexa( T toConvert ) { /// @param with_head # /// @return The hexadecimal string, is empty in case of an error. AI_FORCE_INLINE -std::string Rgba2Hex(floatr, float g, float b, float a, bool with_head) +std::string Rgba2Hex(float r, float g, float b, float a, bool with_head) { std::stringstream ss; if (with_head) From f80bdc5b713f3b9546df10aaedd9025020c75c7b Mon Sep 17 00:00:00 2001 From: Hehongyuanlove <51571751+Hehongyuanlove@users.noreply.github.com> Date: Fri, 17 Apr 2020 12:57:33 +0800 Subject: [PATCH 7/9] Update StringUtils.h --- include/assimp/StringUtils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/assimp/StringUtils.h b/include/assimp/StringUtils.h index b057b1a9d..a22876896 100644 --- a/include/assimp/StringUtils.h +++ b/include/assimp/StringUtils.h @@ -154,7 +154,7 @@ std::string DecimalToHexa( T toConvert ) { /// @param with_head # /// @return The hexadecimal string, is empty in case of an error. AI_FORCE_INLINE -std::string Rgba2Hex(float r, float g, float b, float a, bool with_head) +std::string Rgba2Hex(int r, int g, int b, int a, bool with_head) { std::stringstream ss; if (with_head) From 9c52fd763323586ecff1713e6b341b996bbe8b5d Mon Sep 17 00:00:00 2001 From: Hehongyuanlove <51571751+Hehongyuanlove@users.noreply.github.com> Date: Fri, 17 Apr 2020 12:58:41 +0800 Subject: [PATCH 8/9] Update D3MFExporter.cpp --- code/3MF/D3MFExporter.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/3MF/D3MFExporter.cpp b/code/3MF/D3MFExporter.cpp index 725992207..83036b236 100644 --- a/code/3MF/D3MFExporter.cpp +++ b/code/3MF/D3MFExporter.cpp @@ -258,10 +258,10 @@ void D3MFExporter::writeBaseMaterials() { if(color.r <= 1 && color.g <= 1 && color.b <= 1 && color.a <= 1){ hexDiffuseColor = Rgba2Hex( - ((ai_real)color.r)*255, - ((ai_real)color.g)*255, - ((ai_real)color.b)*255, - ((ai_real)color.a)*255, + (int)((ai_real)color.r)*255, + (int)((ai_real)color.g)*255, + (int)((ai_real)color.b)*255, + (int)((ai_real)color.a)*255, true ); From e299f71cfe6620373c52fba27b1a10d76d3481b2 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 17 Apr 2020 16:16:28 +0200 Subject: [PATCH 9/9] Adapt the formatting --- include/assimp/StringUtils.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/include/assimp/StringUtils.h b/include/assimp/StringUtils.h index a22876896..7e1cb4ce0 100644 --- a/include/assimp/StringUtils.h +++ b/include/assimp/StringUtils.h @@ -145,7 +145,6 @@ std::string DecimalToHexa( T toConvert ) { return result; } -/// @fn Rgba2Hex /// @brief translate RGBA to String /// @param r aiColor.r /// @param g aiColor.g @@ -153,14 +152,14 @@ std::string DecimalToHexa( T toConvert ) { /// @param a aiColor.a /// @param with_head # /// @return The hexadecimal string, is empty in case of an error. -AI_FORCE_INLINE -std::string Rgba2Hex(int r, int g, int b, int a, bool with_head) -{ +AI_FORCE_INLINE std::string Rgba2Hex(int r, int g, int b, int a, bool with_head) { std::stringstream ss; - if (with_head) + if (with_head) { ss << "#"; + } ss << std::hex << (r << 24 | g << 16 | b << 8 | a); - return ss.str(); + + return ss.str(); } #endif // INCLUDED_AI_STRINGUTILS_H