Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Conda Windows warnings #652

Merged
merged 5 commits into from
Dec 8, 2024
Merged

Remove Conda Windows warnings #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f9358a8
Missing include
j-rivero Oct 16, 2024
69e2f82
Fix warnings in Conda Windows
j-rivero Nov 26, 2024
13505a7
Do not use float for double check
j-rivero Nov 28, 2024
2bc23aa
Use float for double check
j-rivero Nov 28, 2024
0595130
Merge branch 'gz-common5' into jrivero/fix_conda_warnings
j-rivero Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions graphics/src/AssimpLoader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include <assimp/Importer.hpp> // C++ importer interface
#include <assimp/postprocess.h> // Post processing flags
#include <assimp/scene.h> // Output data structure
#include <assimp/material.h>

// Disable warning for converting double to unsigned char
#ifdef _WIN32
Expand Down
4 changes: 2 additions & 2 deletions graphics/src/AssimpLoader_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ TEST_F(AssimpLoader, LoadGlTF2BoxTransmission)
const common::MaterialPtr mat = mesh->MaterialByIndex(0u);
ASSERT_TRUE(mat.get());
// transmission currently modeled as transparency
EXPECT_FLOAT_EQ(0.1, mat->Transparency());
EXPECT_FLOAT_EQ(0.1f, mat->Transparency());
delete mesh;
#endif
}
Expand Down Expand Up @@ -791,7 +791,7 @@ TEST_F(AssimpLoader, LoadGlbPbrAsset)
EXPECT_NE(pbr->RoughnessMapData(), nullptr);
// Check pixel values to test metallicroughness texture splitting
EXPECT_FLOAT_EQ(pbr->MetalnessMapData()->Pixel(256, 256).R(), 0.0);
EXPECT_FLOAT_EQ(pbr->RoughnessMapData()->Pixel(256, 256).R(), 124.0 / 255.0);
EXPECT_FLOAT_EQ(pbr->RoughnessMapData()->Pixel(256, 256).R(), 124.0f / 255.0f);

// Bug in assimp 5.0.x that doesn't parse coordinate sets properly
// \todo(iche033) Lightmaps are disabled for glb meshes
Expand Down
Loading