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

fix build most recent emscripten build #7192

Merged
merged 1 commit into from
Sep 21, 2023
Merged

fix build most recent emscripten build #7192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 NEW_RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ appropriate header in [RELEASE_NOTES.md](./RELEASE_NOTES.md).

- engine: remove `BloomOptions::anamorphism` which wasn't working well in most cases [**API CHANGE**]
- engine: new API to return a Material's supported variants, C++ only (b/297456590)
- build: fix emscripten-1.3.46 build
2 changes: 1 addition & 1 deletion filament/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ if (MSVC)
set(FILAMENT_WARNINGS /W3)
else()
set(FILAMENT_WARNINGS
-Wall -Wextra -Wno-unused-parameter
-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
-Wextra-semi -Wnewline-eof -Wdeprecated -Wundef
-Wgnu-conditional-omitted-operand
-Wweak-vtables -Wnon-virtual-dtor -Wclass-varargs -Wimplicit-fallthrough
Expand Down
2 changes: 1 addition & 1 deletion filament/backend/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ if (MSVC)
set(FILAMENT_WARNINGS /W3)
else()
set(FILAMENT_WARNINGS
-Wall -Wextra -Wno-unused-parameter
-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
-Wextra-semi -Wnewline-eof -Wdeprecated -Wundef
-Wgnu-conditional-omitted-operand
-Wweak-vtables -Wnon-virtual-dtor -Wclass-varargs -Wimplicit-fallthrough
Expand Down
14 changes: 8 additions & 6 deletions libs/math/include/math/quat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,27 +171,29 @@ typedef details::TQuaternion<double> quat;
typedef details::TQuaternion<float> quatf;
typedef details::TQuaternion<half> quath;

constexpr inline quat operator "" _i(long double v) {
// note: don't put a space between "" and _{i,j,k}, this is deprecated

constexpr inline quat operator ""_i(long double v) {
return { 0.0, double(v), 0.0, 0.0 };
}

constexpr inline quat operator "" _j(long double v) {
constexpr inline quat operator ""_j(long double v) {
return { 0.0, 0.0, double(v), 0.0 };
}

constexpr inline quat operator "" _k(long double v) {
constexpr inline quat operator ""_k(long double v) {
return { 0.0, 0.0, 0.0, double(v) };
}

constexpr inline quat operator "" _i(unsigned long long v) {
constexpr inline quat operator ""_i(unsigned long long v) {
return { 0.0, double(v), 0.0, 0.0 };
}

constexpr inline quat operator "" _j(unsigned long long v) {
constexpr inline quat operator ""_j(unsigned long long v) {
return { 0.0, 0.0, double(v), 0.0 };
}

constexpr inline quat operator "" _k(unsigned long long v) {
constexpr inline quat operator ""_k(unsigned long long v) {
return { 0.0, 0.0, 0.0, double(v) };
}

Expand Down
Loading