fix unix dependencies and added ifdef include windows around opengl includes

Former-commit-id: 46d389a9fee6d72fd3a2e8fee55cdf6a95060ec7

colon.h

@@ -76,7 +76,7 @@ inline void igl::colon(
     }
   }
   // resize output
-  int n = floor((hi-low)/step)+1;
+  int n = floor(double((hi-low)/step))+1;
   I.resize(n);
   int i = 0;
   T v = (T)low;

create_index_vbo.h

@@ -7,6 +7,11 @@
 #if __APPLE__
 #  include <OpenGL/gl.h>
 #else
+#  ifdef _WIN32
+#    define NOMINMAX
+#    include <Windows.h>
+#    undef NOMINMAX
+#  endif
 #  include <GL/gl.h>
 #endif
 

create_mesh_vbo.h

@@ -7,6 +7,11 @@
 #if __APPLE__
 #  include <OpenGL/gl.h>
 #else
+#  ifdef _WIN32
+#    define NOMINMAX
+#    include <Windows.h>
+#    undef NOMINMAX
+#  endif
 #  include <GL/gl.h>
 #endif
 

create_shader_program.h

@@ -6,6 +6,11 @@
 #ifdef __APPLE__
 #   include <OpenGL/gl.h>
 #else
+#  ifdef _WIN32
+#    define NOMINMAX
+#    include <Windows.h>
+#    undef NOMINMAX
+#  endif
 #   include <GL/gl.h>
 #endif
 

create_vector_vbo.h

@@ -7,6 +7,11 @@
 #if __APPLE__
 #  include <OpenGL/gl.h>
 #else
+#  ifdef _WIN32
+#    define NOMINMAX
+#    include <Windows.h>
+#    undef NOMINMAX
+#  endif
 #  include <GL/gl.h>
 #endif
 

destroy_shader_program.h

@@ -2,9 +2,14 @@
 #define IGL_DESTROY_SHADER_PROGRAM_H
 
 #ifdef __APPLE__
-#   include <OpenGL/gl.h>
+#  include <OpenGL/gl.h>
 #else
-#   include <GL/gl.h>
+#  ifdef _WIN32
+#    define NOMINMAX
+#    include <Windows.h>
+#    undef NOMINMAX
+#  endif
+#  include <GL/gl.h>
 #endif
 
 namespace igl

get_seconds.h

@@ -9,9 +9,15 @@ namespace igl
 }
 
 //Implementation
-#include <sys/time.h>
-//#include <ctime>
-
+#if _WIN32
+#  include <ctime>
+inline double igl::get_seconds()
+{
+  // This does not work on mac os x with glut in the main loop
+  return double(clock())/CLOCKS_PER_SEC;
+}
+#else
+#  include <sys/time.h>
 inline double igl::get_seconds()
 {
   timeval time;
@@ -21,3 +27,4 @@ inline double igl::get_seconds()
   //return double(clock())/CLOCKS_PER_SEC;
 }
 #endif
+#endif

gl_type_size.h

@@ -4,6 +4,11 @@
 #if __APPLE__
 #  include <OpenGL/gl.h>
 #else
+#  ifdef _WIN32
+#    define NOMINMAX
+#    include <Windows.h>
+#    undef NOMINMAX
+#  endif
 #  include <GL/gl.h>
 #endif
 

is_dir.h

@@ -16,6 +16,15 @@ namespace igl
 
 // Implementation
 #include <sys/stat.h>
+
+#ifndef S_ISDIR
+#define S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
+#endif
+
+#ifndef S_ISREG
+#define S_ISREG(mode)  (((mode) & S_IFMT) == S_IFREG)
+#endif
+
 inline bool igl::is_dir(const char * filename)
 {
   struct stat status;

is_readable.h

@@ -8,14 +8,28 @@ namespace igl
   //   filename  path to file
   // Returns true if file exists and is readable and false if file doesn't
   // exist or *is not readable*
+  //
+  // Note: Windows version will not check user or group ids
   inline bool is_readable(const char * filename);
 }
 
 
 // Implementation
-#include <sys/stat.h>
-#include <unistd.h>
-
+#ifdef _WIN32
+#  include <cstdio>
+inline bool igl::is_readable(const char* filename)
+{
+  FILE * f = fopen(filename,"r");
+  if(f == NULL)
+  {
+    return false;
+  }
+  fclose(f);
+  return true;
+}
+#else
+#  include <sys/stat.h>
+#  include <unistd.h>
 inline bool igl::is_readable(const char* filename)
 {
   // Check if file already exists
@@ -43,5 +57,8 @@ inline bool igl::is_readable(const char* filename)
 
   // Dealing with other
   return S_IROTH & status.st_mode;
+
 }
 #endif
+
+#endif

is_writable.h

@@ -8,11 +8,30 @@ namespace igl
   //   filename  path to file
   // Returns true if file exists and is writable and false if file doesn't
   // exist or *is not writable*
+  //
+  // Note: Windows version will not test group and user id
   inline bool is_writable(const char * filename);
 }
 
 
 // Implementation
+#ifdef _WIN32
+#include <sys/stat.h>
+#ifndef S_IWUSR
+#  define S_IWUSR S_IWRITE
+#endif
+inline bool is_writable(const char* filename)
+{
+  // Check if file already exists
+  struct stat status;
+  if(stat(filename,&status)!=0)
+  {
+    return false;
+  }
+
+  return S_IWUSR & status.st_mode;
+}
+#else
 #include <sys/stat.h>
 #include <unistd.h>
 
@@ -45,3 +64,4 @@ inline bool igl::is_writable(const char* filename)
   return S_IWOTH & status.st_mode;
 }
 #endif
+#endif

load_shader.h

@@ -2,9 +2,14 @@
 #define IGL_LOAD_SHADER_H 
 
 #ifdef __APPLE__
-#   include <OpenGL/gl.h>
+#  include <OpenGL/gl.h>
 #else
-#   include <GL/gl.h>
+#  ifdef _WIN32
+#    define NOMINMAX
+#    include <Windows.h>
+#    undef NOMINMAX
+#  endif
+#  include <GL/gl.h>
 #endif
 
 namespace igl

print_gl_get.h

@@ -4,6 +4,11 @@
 #if __APPLE__
 #  include <OpenGL/gl.h>
 #else
+#  ifdef _WIN32
+#    define NOMINMAX
+#    include <Windows.h>
+#    undef NOMINMAX
+#  endif
 #  include <GL/gl.h>
 #endif
 

print_program_info_log.h

@@ -2,9 +2,14 @@
 #define IGL_PRINT_PROGRAM_INFO_LOG_H
 
 #ifdef __APPLE__
-#   include <OpenGL/gl.h>
+#  include <OpenGL/gl.h>
 #else
-#   include <GL/gl.h>
+#  ifdef _WIN32
+#    define NOMINMAX
+#    include <Windows.h>
+#    undef NOMINMAX
+#  endif
+#  include <GL/gl.h>
 #endif
 namespace igl
 {

print_shader_info_log.h

@@ -2,9 +2,14 @@
 #define IGL_PRINT_SHADER_INFO_LOG_H
 
 #ifdef __APPLE__
-#   include <OpenGL/gl.h>
+#  include <OpenGL/gl.h>
 #else
-#   include <GL/gl.h>
+#  ifdef _WIN32
+#    define NOMINMAX
+#    include <Windows.h>
+#    undef NOMINMAX
+#  endif
+#  include <GL/gl.h>
 #endif
 
 namespace igl

project.h

@@ -21,11 +21,16 @@ namespace igl
 // Implementation
 
 #ifdef __APPLE__
-# include <OpenGL/gl.h>
-# include <OpenGL/glu.h>
+#  include <OpenGL/gl.h>
+#  include <OpenGL/glu.h>
 #else
-# include <GL/gl.h>
-# include <GL/glu.h>
+#  ifdef _WIN32
+#    define NOMINMAX
+#    include <Windows.h>
+#    undef NOMINMAX
+#  endif
+#  include <GL/gl.h>
+#  include <GL/glu.h>
 #endif
 
 inline int igl::project(

report_gl_error.h

@@ -2,11 +2,16 @@
 #define IGL_REPORT_GL_ERROR
 
 #ifdef __APPLE__
-#   include <OpenGL/gl.h>
-#   include <OpenGL/glu.h>
+#  include <OpenGL/gl.h>
+#  include <OpenGL/glu.h>
 #else
-#   include <GL/gl.h>
-#   include <GL/glu.h>
+#  ifdef _WIN32
+#    define NOMINMAX
+#    include <Windows.h>
+#    undef NOMINMAX
+#  endif
+#  include <GL/gl.h>
+#  include <GL/glu.h>
 #endif
 
 #include <cstdio>

uniform_type_to_string.h

@@ -4,9 +4,14 @@
 #include <string>
 
 #ifdef __APPLE__
-#   include <OpenGL/gl.h>
+#  include <OpenGL/gl.h>
 #else
-#   include <GL/gl.h>
+#  ifdef _WIN32
+#    define NOMINMAX
+#    include <Windows.h>
+#    undef NOMINMAX
+#  endif
+#  include <GL/gl.h>
 #endif
 
 namespace igl

unproject.h

@@ -24,6 +24,11 @@ namespace igl
 # include <OpenGL/gl.h>
 # include <OpenGL/glu.h>
 #else
+#  ifdef _WIN32
+#    define NOMINMAX
+#    include <Windows.h>
+#    undef NOMINMAX
+#  endif
 # include <GL/gl.h>
 # include <GL/glu.h>
 #endif