Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:27:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed compilation errors on Mac & Ubuntu

Browse source
This commit is contained in:
Olivier Prat 2019-04-05 11:03:41 +02:00
parent 89ca7ac415
commit b66aa4a742
2 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/image/src/image/CubeMap.cpp
View file

@ -418,7 +418,9 @@ void CubeMap::getFaceUV(const glm::vec3& dir, int* index, glm::vec2* uv) {
auto isYPositive = dir.y > 0; auto isYPositive = dir.y > 0;
auto isZPositive = dir.z > 0; auto isZPositive = dir.z > 0;
float maxAxis, uc, vc; float maxAxis = 1.0f;
float uc = 0.0f;
float vc = 0.0f;
// POSITIVE X // POSITIVE X
if (isXPositive && absX >= absY && absX >= absZ) { if (isXPositive && absX >= absY && absX >= absZ) {
@ -518,8 +520,8 @@ void CubeMap::generateGGXSamples(GGXSamples& data, float roughness, const int re
const float mipBias = 3.0f; const float mipBias = 3.0f;
const auto sampleCount = data.points.size(); const auto sampleCount = data.points.size();
const auto hammersleySequenceLength = data.points.size(); const auto hammersleySequenceLength = data.points.size();
int sampleIndex = 0; size_t sampleIndex = 0;
int hammersleySampleIndex = 0; size_t hammersleySampleIndex = 0;
float NdotL; float NdotL;
data.invTotalWeight = 0.0f; data.invTotalWeight = 0.0f;
@ -636,14 +638,14 @@ void CubeMap::convolveMipFaceForGGX(const GGXSamples& samples, CubeMap& output,
glm::vec4 CubeMap::computeConvolution(const glm::vec3& N, const GGXSamples& samples) const { glm::vec4 CubeMap::computeConvolution(const glm::vec3& N, const GGXSamples& samples) const {
// from tangent-space vector to world-space // from tangent-space vector to world-space
glm::vec3 bitangent = abs(N.z) < 0.999 ? glm::vec3(0.0, 0.0, 1.0) : glm::vec3(1.0, 0.0, 0.0); glm::vec3 bitangent = std::abs(N.z) < 0.999 ? glm::vec3(0.0, 0.0, 1.0) : glm::vec3(1.0, 0.0, 0.0);
glm::vec3 tangent = glm::normalize(glm::cross(bitangent, N)); glm::vec3 tangent = glm::normalize(glm::cross(bitangent, N));
bitangent = glm::cross(N, tangent); bitangent = glm::cross(N, tangent);
const size_t sampleCount = samples.points.size(); const size_t sampleCount = samples.points.size();
glm::vec4 prefilteredColor = glm::vec4(0.0f); glm::vec4 prefilteredColor = glm::vec4(0.0f);
for (int i = 0; i < sampleCount; ++i) { for (size_t i = 0; i < sampleCount; ++i) {
const auto& sample = samples.points[i]; const auto& sample = samples.points[i];
glm::vec3 L(sample.x, sample.y, sample.z); glm::vec3 L(sample.x, sample.y, sample.z);
float NdotL = L.z; float NdotL = L.z;

26
libraries/image/src/image/TextureProcessing.cpp
View file

@ -534,8 +534,8 @@ public:
}; };
#endif #endif
void image::convertToFloatFromPacked(const unsigned char* source, int width, int height, size_t srcLineByteStride, gpu::Element sourceFormat, void convertToFloatFromPacked(const unsigned char* source, int width, int height, size_t srcLineByteStride, gpu::Element sourceFormat,
glm::vec4* output, size_t outputLinePixelStride) { glm::vec4* output, size_t outputLinePixelStride) {
glm::vec4* outputIt; glm::vec4* outputIt;
auto unpackFunc = getHDRUnpackingFunction(sourceFormat); auto unpackFunc = getHDRUnpackingFunction(sourceFormat);
@ -554,8 +554,8 @@ void image::convertToFloatFromPacked(const unsigned char* source, int width, int
} }
} }
void image::convertToPackedFromFloat(unsigned char* output, int width, int height, size_t outputLineByteStride, gpu::Element outputFormat, void convertToPackedFromFloat(unsigned char* output, int width, int height, size_t outputLineByteStride, gpu::Element outputFormat,
const glm::vec4* source, size_t srcLinePixelStride) { const glm::vec4* source, size_t srcLinePixelStride) {
const glm::vec4* sourceIt; const glm::vec4* sourceIt;
auto packFunc = getHDRPackingFunction(outputFormat); auto packFunc = getHDRPackingFunction(outputFormat);
@ -576,10 +576,6 @@ void image::convertToPackedFromFloat(unsigned char* output, int width, int heigh
nvtt::OutputHandler* getNVTTCompressionOutputHandler(gpu::Texture* outputTexture, int face, nvtt::CompressionOptions& compressionOptions) { nvtt::OutputHandler* getNVTTCompressionOutputHandler(gpu::Texture* outputTexture, int face, nvtt::CompressionOptions& compressionOptions) {
auto outputFormat = outputTexture->getStoredMipFormat(); auto outputFormat = outputTexture->getStoredMipFormat();
nvtt::InputFormat inputFormat = nvtt::InputFormat_RGBA_32F;
nvtt::WrapMode wrapMode = nvtt::WrapMode_Mirror;
nvtt::AlphaMode alphaMode = nvtt::AlphaMode_None;
bool useNVTT = false; bool useNVTT = false;
compressionOptions.setQuality(nvtt::Quality_Production); compressionOptions.setQuality(nvtt::Quality_Production);
@ -620,12 +616,8 @@ void convertImageToHDRTexture(gpu::Texture* texture, Image&& image, BackendTarge
Image localCopy = image.getConvertedToFormat(Image::Format_RGBAF); Image localCopy = image.getConvertedToFormat(Image::Format_RGBAF);
const int width = localCopy.getWidth(), height = localCopy.getHeight(); const int width = localCopy.getWidth();
auto mipFormat = texture->getStoredMipFormat(); const int height = localCopy.getHeight();
nvtt::InputFormat inputFormat = nvtt::InputFormat_RGBA_32F;
nvtt::WrapMode wrapMode = nvtt::WrapMode_Mirror;
nvtt::AlphaMode alphaMode = nvtt::AlphaMode_None;
nvtt::OutputOptions outputOptions; nvtt::OutputOptions outputOptions;
outputOptions.setOutputHeader(false); outputOptions.setOutputHeader(false);
@ -641,9 +633,9 @@ void convertImageToHDRTexture(gpu::Texture* texture, Image&& image, BackendTarge
outputOptions.setOutputHandler(outputHandler.get()); outputOptions.setOutputHandler(outputHandler.get());
nvtt::Surface surface; nvtt::Surface surface;
surface.setImage(inputFormat, width, height, 1, localCopy.getBits()); surface.setImage(nvtt::InputFormat_RGBA_32F, width, height, 1, localCopy.getBits());
surface.setAlphaMode(alphaMode); surface.setAlphaMode(nvtt::AlphaMode_None);
surface.setWrapMode(wrapMode); surface.setWrapMode(nvtt::WrapMode_Mirror);
SequentialTaskDispatcher dispatcher(abortProcessing); SequentialTaskDispatcher dispatcher(abortProcessing);
nvtt::Compressor compressor; nvtt::Compressor compressor;