From d8ac60009c19e4c8c2624cafa21fff4f60e9c20f Mon Sep 17 00:00:00 2001 From: Philip Rideout Date: Fri, 3 Apr 2020 12:12:41 -0700 Subject: [PATCH] FilamentApp: use angle bracket syntax for includes. --- samples/animation.cpp | 4 ++-- samples/depthtesting.cpp | 4 ++-- samples/frame_generator.cpp | 8 ++++---- samples/gltf_viewer.cpp | 6 +++--- samples/heightfield.cpp | 2 +- samples/hellopbr.cpp | 4 ++-- samples/hellotriangle.cpp | 4 ++-- samples/lightbulb.cpp | 12 ++++++------ samples/material_sandbox.cpp | 8 ++++---- samples/point_sprites.cpp | 4 ++-- samples/sample_cloth.cpp | 4 ++-- samples/sample_full_pbr.cpp | 6 +++--- samples/sample_normal_map.cpp | 4 ++-- samples/shadowtest.cpp | 6 +++--- samples/strobecolor.cpp | 4 ++-- samples/suzanne.cpp | 6 +++--- samples/texturedquad.cpp | 4 ++-- samples/vbotest.cpp | 2 +- samples/viewtest.cpp | 2 +- 19 files changed, 47 insertions(+), 47 deletions(-) diff --git a/samples/animation.cpp b/samples/animation.cpp index 004a455f0b..c68a057912 100644 --- a/samples/animation.cpp +++ b/samples/animation.cpp @@ -27,8 +27,8 @@ #include -#include "filamentapp/Config.h" -#include "filamentapp/FilamentApp.h" +#include +#include #include diff --git a/samples/depthtesting.cpp b/samples/depthtesting.cpp index 562959dff6..e07734582f 100644 --- a/samples/depthtesting.cpp +++ b/samples/depthtesting.cpp @@ -27,8 +27,8 @@ #include -#include "filamentapp/Config.h" -#include "filamentapp/FilamentApp.h" +#include +#include #include diff --git a/samples/frame_generator.cpp b/samples/frame_generator.cpp index 94224ac258..3fe94f1092 100644 --- a/samples/frame_generator.cpp +++ b/samples/frame_generator.cpp @@ -51,10 +51,10 @@ #include #include -#include "filamentapp/Config.h" -#include "filamentapp/IBL.h" -#include "filamentapp/FilamentApp.h" -#include "filamentapp/MeshAssimp.h" +#include +#include +#include +#include using namespace filament::math; using namespace filament; diff --git a/samples/gltf_viewer.cpp b/samples/gltf_viewer.cpp index eecce7b880..35b1b73fc4 100644 --- a/samples/gltf_viewer.cpp +++ b/samples/gltf_viewer.cpp @@ -16,9 +16,9 @@ #define GLTFIO_SIMPLEVIEWER_IMPLEMENTATION -#include "filamentapp/Config.h" -#include "filamentapp/FilamentApp.h" -#include "filamentapp/IBL.h" +#include +#include +#include #include #include diff --git a/samples/heightfield.cpp b/samples/heightfield.cpp index c7b1d20af3..e82bd493d1 100644 --- a/samples/heightfield.cpp +++ b/samples/heightfield.cpp @@ -33,7 +33,7 @@ #include -#include "filamentapp/FilamentApp.h" +#include #define STB_PERLIN_IMPLEMENTATION #include diff --git a/samples/hellopbr.cpp b/samples/hellopbr.cpp index 0a4b5918f8..20401e522f 100644 --- a/samples/hellopbr.cpp +++ b/samples/hellopbr.cpp @@ -26,8 +26,8 @@ #include -#include "filamentapp/Config.h" -#include "filamentapp/FilamentApp.h" +#include +#include #include "generated/resources/resources.h" diff --git a/samples/hellotriangle.cpp b/samples/hellotriangle.cpp index 946f15efa1..a8f24fc1e8 100644 --- a/samples/hellotriangle.cpp +++ b/samples/hellotriangle.cpp @@ -27,8 +27,8 @@ #include -#include "filamentapp/Config.h" -#include "filamentapp/FilamentApp.h" +#include +#include #include diff --git a/samples/lightbulb.cpp b/samples/lightbulb.cpp index 6734149306..58b8946cfd 100644 --- a/samples/lightbulb.cpp +++ b/samples/lightbulb.cpp @@ -37,12 +37,12 @@ #include #include -#include "filamentapp/Config.h" -#include "filamentapp/FilamentApp.h" -#include "filamentapp/MeshAssimp.h" -#include "filamentapp/Cube.h" -#include "filamentapp/IcoSphere.h" -#include "filamentapp/Sphere.h" +#include +#include +#include +#include +#include +#include #include "generated/resources/resources.h" diff --git a/samples/material_sandbox.cpp b/samples/material_sandbox.cpp index d99ec48fa1..0a7c3bcf49 100644 --- a/samples/material_sandbox.cpp +++ b/samples/material_sandbox.cpp @@ -44,10 +44,10 @@ #include #include -#include "filamentapp/Config.h" -#include "filamentapp/IBL.h" -#include "filamentapp/FilamentApp.h" -#include "filamentapp/MeshAssimp.h" +#include +#include +#include +#include #include "material_sandbox.h" diff --git a/samples/point_sprites.cpp b/samples/point_sprites.cpp index cee63446b9..54fd14ea2d 100644 --- a/samples/point_sprites.cpp +++ b/samples/point_sprites.cpp @@ -31,8 +31,8 @@ #include #include -#include "filamentapp/Config.h" -#include "filamentapp/FilamentApp.h" +#include +#include #include diff --git a/samples/sample_cloth.cpp b/samples/sample_cloth.cpp index 7a0aa7c413..1ca2ada47d 100644 --- a/samples/sample_cloth.cpp +++ b/samples/sample_cloth.cpp @@ -37,8 +37,8 @@ #include #include -#include "filamentapp/Config.h" -#include "filamentapp/FilamentApp.h" +#include +#include #include diff --git a/samples/sample_full_pbr.cpp b/samples/sample_full_pbr.cpp index c0a63018cc..29b6e6853f 100644 --- a/samples/sample_full_pbr.cpp +++ b/samples/sample_full_pbr.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "filamentapp/Config.h" -#include "filamentapp/FilamentApp.h" -#include "filamentapp/MeshAssimp.h" +#include +#include +#include #include #include diff --git a/samples/sample_normal_map.cpp b/samples/sample_normal_map.cpp index 1cef59fc74..a6a92874fe 100644 --- a/samples/sample_normal_map.cpp +++ b/samples/sample_normal_map.cpp @@ -37,8 +37,8 @@ #include #include -#include "filamentapp/Config.h" -#include "filamentapp/FilamentApp.h" +#include +#include #include #include diff --git a/samples/shadowtest.cpp b/samples/shadowtest.cpp index b6d0e041c2..2b156e2e0b 100644 --- a/samples/shadowtest.cpp +++ b/samples/shadowtest.cpp @@ -28,9 +28,9 @@ #include -#include "filamentapp/Config.h" -#include "filamentapp/FilamentApp.h" -#include "filamentapp/MeshAssimp.h" +#include +#include +#include #include "generated/resources/resources.h" diff --git a/samples/strobecolor.cpp b/samples/strobecolor.cpp index 38a7e19441..bda67b681a 100644 --- a/samples/strobecolor.cpp +++ b/samples/strobecolor.cpp @@ -18,8 +18,8 @@ #include #include -#include "filamentapp/Config.h" -#include "filamentapp/FilamentApp.h" +#include +#include #include diff --git a/samples/suzanne.cpp b/samples/suzanne.cpp index 4d0be5a3cc..88eef51055 100644 --- a/samples/suzanne.cpp +++ b/samples/suzanne.cpp @@ -31,9 +31,9 @@ #include #include -#include "filamentapp/Config.h" -#include "filamentapp/FilamentApp.h" -#include "filamentapp/IBL.h" +#include +#include +#include #include diff --git a/samples/texturedquad.cpp b/samples/texturedquad.cpp index c510d5c783..a19d3ef1d4 100644 --- a/samples/texturedquad.cpp +++ b/samples/texturedquad.cpp @@ -30,8 +30,8 @@ #include -#include "filamentapp/Config.h" -#include "filamentapp/FilamentApp.h" +#include +#include #include diff --git a/samples/vbotest.cpp b/samples/vbotest.cpp index 7ab2b18ea5..cb340b57d4 100644 --- a/samples/vbotest.cpp +++ b/samples/vbotest.cpp @@ -21,7 +21,7 @@ #include #include -#include "filamentapp/FilamentApp.h" +#include #include diff --git a/samples/viewtest.cpp b/samples/viewtest.cpp index c2d63fce08..3c02f1a700 100644 --- a/samples/viewtest.cpp +++ b/samples/viewtest.cpp @@ -20,7 +20,7 @@ #include #include -#include "filamentapp/FilamentApp.h" +#include #include