Skip to content

Commit a4feedc

Browse files
authored
Remove Conda Windows warnings (#652)
* Missing include * Fix warnings in Conda Windows --------- Signed-off-by: Jose Luis Rivero <[email protected]>
1 parent 12aec5b commit a4feedc

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

graphics/src/AssimpLoader.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#include <assimp/Importer.hpp> // C++ importer interface
4141
#include <assimp/postprocess.h> // Post processing flags
4242
#include <assimp/scene.h> // Output data structure
43+
#include <assimp/material.h>
4344

4445
// Disable warning for converting double to unsigned char
4546
#ifdef _WIN32

graphics/src/AssimpLoader_TEST.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ TEST_F(AssimpLoader, LoadGlTF2BoxTransmission)
684684
const common::MaterialPtr mat = mesh->MaterialByIndex(0u);
685685
ASSERT_TRUE(mat.get());
686686
// transmission currently modeled as transparency
687-
EXPECT_FLOAT_EQ(0.1, mat->Transparency());
687+
EXPECT_FLOAT_EQ(0.1f, mat->Transparency());
688688
delete mesh;
689689
#endif
690690
}
@@ -791,7 +791,7 @@ TEST_F(AssimpLoader, LoadGlbPbrAsset)
791791
EXPECT_NE(pbr->RoughnessMapData(), nullptr);
792792
// Check pixel values to test metallicroughness texture splitting
793793
EXPECT_FLOAT_EQ(pbr->MetalnessMapData()->Pixel(256, 256).R(), 0.0);
794-
EXPECT_FLOAT_EQ(pbr->RoughnessMapData()->Pixel(256, 256).R(), 124.0 / 255.0);
794+
EXPECT_FLOAT_EQ(pbr->RoughnessMapData()->Pixel(256, 256).R(), 124.0f / 255.0f);
795795

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

0 commit comments

Comments
 (0)