Skip to content

Commit 2c9609a

Browse files
authored
.h cleanup #9 (#7883)
1 parent c12edbd commit 2c9609a

73 files changed

Lines changed: 343 additions & 304 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

libs/openFrameworks/3d/of3dUtils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#define GLM_FORCE_CTOR_INIT
44
#define GLM_ENABLE_EXPERIMENTAL
5-
#include "glm/vec3.hpp"
5+
#include <glm/vec3.hpp>
66

77
/// \brief Draws x,y,z axes representing the current reference frame.
88
///

libs/openFrameworks/3d/ofCamera.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#define GLM_FORCE_CTOR_INIT
55
#define GLM_ENABLE_EXPERIMENTAL
6-
#include "glm/gtx/transform.hpp"
7-
#include "glm/gtc/quaternion.hpp"
6+
#include <glm/gtx/transform.hpp>
7+
#include <glm/gtc/quaternion.hpp>
88
#include "of3dGraphics.h"
99

1010
using std::shared_ptr;

libs/openFrameworks/3d/ofEasyCam.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#define GLM_FORCE_CTOR_INIT
77
#define GLM_ENABLE_EXPERIMENTAL
8-
#include "glm/gtx/vector_angle.hpp"
8+
#include <glm/gtx/vector_angle.hpp>
99
#include <limits>
1010

1111
// when an ofEasyCam is moving due to momentum, this keeps it

libs/openFrameworks/3d/ofEasyCam.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#define GLM_FORCE_CTOR_INIT
88
#define GLM_ENABLE_EXPERIMENTAL
9-
#include "glm/gtc/quaternion.hpp"
9+
#include <glm/gtc/quaternion.hpp>
1010

1111
/// \brief A super simple camera for interacting with objects in 3D space.
1212
class ofEasyCam : public ofCamera {

libs/openFrameworks/3d/ofNode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#define GLM_FORCE_CTOR_INIT
77
#define GLM_ENABLE_EXPERIMENTAL
8-
#include "glm/mat4x4.hpp"
8+
#include <glm/mat4x4.hpp>
99
#include <glm/gtc/quaternion.hpp>
1010
#include <array>
1111

libs/openFrameworks/app/ofAppEGLWindow.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#include <unistd.h> // read close
2323
#include <linux/joystick.h>
2424

25-
#include "linux/kd.h" // keyboard stuff...
26-
#include "termios.h"
27-
#include "sys/ioctl.h"
25+
#include <linux/kd.h> // keyboard stuff...
26+
#include <termios.h>
27+
#include <sys/ioctl.h>
2828

2929
#include <string.h> // strlen
3030

libs/openFrameworks/app/ofAppGLFWWindow.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "ofGLRenderer.h"
55

66
#define GLFW_INCLUDE_NONE
7-
#include "GLFW/glfw3.h"
7+
#include <GLFW/glfw3.h>
88

99
#ifdef TARGET_LINUX
1010
#include "ofIcon.h"
@@ -15,7 +15,7 @@
1515
#else
1616
#define GLFW_EXPOSE_NATIVE_EGL
1717
#endif
18-
#include "GLFW/glfw3native.h"
18+
#include <GLFW/glfw3native.h>
1919
#include <X11/XKBlib.h>
2020
#include <X11/Xatom.h>
2121
#include <X11/extensions/Xrandr.h>
@@ -25,7 +25,7 @@
2525
#include <Cocoa/Cocoa.h>
2626
#define GLFW_EXPOSE_NATIVE_COCOA
2727
#define GLFW_EXPOSE_NATIVE_NSGL
28-
#include "GLFW/glfw3native.h"
28+
#include <GLFW/glfw3native.h>
2929
#elif defined(TARGET_WIN32)
3030
#define GLFW_EXPOSE_NATIVE_WIN32
3131
#define GLFW_EXPOSE_NATIVE_WGL

libs/openFrameworks/app/ofAppNoWindow.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
#include "of3dGraphics.h"
55
#include <memory>
66

7+
#include "ofConstants.h"
8+
#ifndef TARGET_WIN32
9+
#include <unistd.h>
10+
#endif
711

812
#if defined TARGET_OSX || defined TARGET_LINUX
913
#include <stdlib.h>

libs/openFrameworks/app/ofMainLoop.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "ofMainLoop.h"
99
#include "ofBaseApp.h"
10-
#include "ofConstants.h"
10+
// #include "ofConstants.h"
1111

1212
//========================================================================
1313
// default windowing

libs/openFrameworks/app/ofWindowSettings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#define GLM_FORCE_CTOR_INIT
44
#define GLM_ENABLE_EXPERIMENTAL
5-
#include "glm/vec2.hpp"
5+
#include <glm/vec2.hpp>
66
#include <string>
77

88
/// \brief Used to represent the available windowing modes for the application.

0 commit comments

Comments
 (0)