diff options
| author | Joursoir <chat@joursoir.net> | 2021-04-10 16:39:57 +0000 |
|---|---|---|
| committer | Joursoir <chat@joursoir.net> | 2021-04-10 16:39:57 +0000 |
| commit | 887314d01046ed2c00db3eb7b4b227f070501aa1 (patch) | |
| tree | b594e1b01f768b7b805000397f2cbe9c8db10b67 | |
| parent | 97c388c80363a15a0ee49af6df6b2bbf4c5a4af1 (diff) | |
| download | space-simulator-887314d01046ed2c00db3eb7b4b227f070501aa1.tar.gz space-simulator-887314d01046ed2c00db3eb7b4b227f070501aa1.tar.bz2 space-simulator-887314d01046ed2c00db3eb7b4b227f070501aa1.zip | |
objects: source files move to game folder; use glm PI
| -rw-r--r-- | src/game/objects.cpp (renamed from src/objects.cpp) | 9 | ||||
| -rw-r--r-- | src/game/objects.hpp (renamed from src/objects.hpp) | 0 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/objects.cpp b/src/game/objects.cpp index b1b24bb..b7dbf66 100644 --- a/src/objects.cpp +++ b/src/game/objects.cpp @@ -1,11 +1,10 @@ #include <glm/glm.hpp> +#include <glm/gtc/constants.hpp> #include "objects.hpp" #include "graphics/Mesh.hpp" #include "graphics/Vertex.hpp" -#define PI 3.1415926535 - using namespace glm; const int cube_num_v = 8; @@ -65,11 +64,11 @@ Mesh *form_sphere(int longitude_count, int latitude_count) float radius = 1.0; // sectors - float longitude_step = PI / longitude_count; + float longitude_step = pi<float>() / longitude_count; float longitude_angle; // stacks - float latitude_step = 2 * PI / latitude_count; + float latitude_step = 2 * pi<float>() / latitude_count; float latitude_angle; int sphere_num_v = (longitude_count + 1) * (latitude_count + 1); @@ -127,7 +126,7 @@ Mesh *form_circle(int angle_count) int i, idx, idy; float x, y, z; float radius = 1.0f; - float angle_step = 2 * PI / angle_count; + float angle_step = 2 * pi<float>() / angle_count; float angle; Vertex *circle_vertices = new Vertex[angle_count]; diff --git a/src/objects.hpp b/src/game/objects.hpp index 3d816b9..3d816b9 100644 --- a/src/objects.hpp +++ b/src/game/objects.hpp |