Define constants as macros

diff --git a/base/main.cc b/base/main.cc
index 052c05a0693ecdada6506f4c08320282f9c4ed1b..a0a57ad4f88f252de7acbe0b94a4d58131fd2edb 100644 (file)
--- a/base/main.cc
+++ b/base/main.cc
@@ -16,20 +16,19 @@ along with I am car. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <iostream>
-#include <GL/gl.h>
-#include <GL/glu.h>
 #include <jsoncpp/json/json.h>
-#include <SDL2/SDL.h>
 #include <signal.h>
 #include "compile.h"
 #include "obstacle.h"
 #include "rrtplanner.h"
+// OpenGL
+#include <GL/gl.h>
+#include <GL/glu.h>
+#include <SDL2/SDL.h>
 
 #define USE_INTERRUPT
 
 bool run_planner = true;
-const int SCREEN_WIDTH = 640;
-const int SCREEN_HEIGHT = 480;
 
 SDL_Window* gw = NULL;
 SDL_GLContext gc;
@@ -45,8 +44,6 @@ void hint(int)
 int main()
 {
         init();
-        glClear(GL_COLOR_BUFFER_BIT);
-        SDL_GL_SwapWindow(gw);
 
         Json::Value jvi; // JSON input
         Json::Value jvo; // JSON output

diff --git a/incl/sample.h b/incl/sample.h
index 886f82b6fd808c1df4f5c2d3794c29618289e995..c38c90a9629becc37757376a55a48413ce68e5f8 100644 (file)
--- a/incl/sample.h
+++ b/incl/sample.h
@@ -25,6 +25,13 @@ along with I am car. If not, see <http://www.gnu.org/licenses/>.
 #define VMIN -5.3 // vertical
 #define VMAX 5.5 // vertical
 
+// OpenGL window size
+#define SCREEN_WIDTH 500
+#define SCREEN_HEIGHT 1500
+
+#define GLPLWSCALE (1.0 / ((VMAX) - (VMIN)))
+#define GLPLHSCALE (1.0 / ((HMAX) - (HMIN)))
+
 RRTNode *sa1();
 
 #endif