Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move math namespace to fix #746.

Browse Source
This commit is contained in:
prideout
2019-02-06 10:52:16 -08:00
committed by Philip Rideout
parent 6089be6de6
commit 5ee359cf40
155 changed files with 746 additions and 717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/imageio/src/ImageEncoder.cpp
View File

@@ -43,7 +43,7 @@
#include <image/ColorTransform.h>
using namespace math;
using namespace filament::math;
namespace image {
@@ -102,7 +102,7 @@ private:
// ImageEncoder::Encoder interface
bool encode(const LinearImage& image) override;
static void float2rgbe(uint8_t rgbe[4], const math::float3& in);
static void float2rgbe(uint8_t rgbe[4], const float3& in);
static size_t countRepeats(uint8_t const* data, size_t length);
static size_t countNonRepeats(uint8_t const* data, size_t length);
static void rle(std::ostream& out, uint8_t const* data, size_t length);
@@ -988,7 +988,7 @@ bool DDSEncoder::encode(const LinearImage& image) {
for (uint32_t y = 0; y < height; y++) {
const float* data = image.getPixelRef(0, y);
for (size_t x = 0; x < width; x++) {
math::half p = math::half(*data);
half p = half(*data);
mStream.write((const char*) &p, 2);
data++;
}