Commit fa6f45aa authored by dheck's avatar dheck
Browse files

Fixed Win32 compilation issues.


git-svn-id: https://pd-gem.svn.sourceforge.net/svnroot/pd-gem/trunk/Gem@155 49b2a0ca-c541-4d49-a7ef-d785e4371512
parent 70ea25df
...@@ -14,6 +14,11 @@ LOG ...@@ -14,6 +14,11 @@ LOG
#ifndef INCLUDE_GEMGLUOBJ_H_ #ifndef INCLUDE_GEMGLUOBJ_H_
#define INCLUDE_GEMGLUOBJ_H_ #define INCLUDE_GEMGLUOBJ_H_
// I hate Microsoft...I shouldn't have to do this!
#ifdef _WINDOWS
#include <windows.h>
#endif
#ifdef MACOSX #ifdef MACOSX
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
......
...@@ -293,7 +293,7 @@ int pix_addmean(unsigned char Dest, unsigned char *Src, int length) ...@@ -293,7 +293,7 @@ int pix_addmean(unsigned char Dest, unsigned char *Src, int length)
#endif // MACOSX #endif // MACOSX
int pix_addsat(unsigned char *leftPix, unsigned char *rightPix, int datasize) void pix_addsat(unsigned char *leftPix, unsigned char *rightPix, int datasize)
{ {
while(datasize--) while(datasize--)
{ {
...@@ -304,7 +304,7 @@ int pix_addsat(unsigned char *leftPix, unsigned char *rightPix, int datasize) ...@@ -304,7 +304,7 @@ int pix_addsat(unsigned char *leftPix, unsigned char *rightPix, int datasize)
} }
int pix_sub(unsigned char *leftPix, unsigned char *rightPix, int datasize) void pix_sub(unsigned char *leftPix, unsigned char *rightPix, int datasize)
{ {
while(datasize--) while(datasize--)
{ {
......
...@@ -48,7 +48,7 @@ GemShape :: ~GemShape() ...@@ -48,7 +48,7 @@ GemShape :: ~GemShape()
// SetVertix // SetVertix
// set up the texture-coordinates // set up the texture-coordinates
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
int GemShape :: SetVertix(GemState* state,float x, float y, float z, float tx, float ty,int curCoord) void GemShape :: SetVertix(GemState* state,float x, float y, float z, float tx, float ty,int curCoord)
{ {
if (state->numTexCoords) if (state->numTexCoords)
glTexCoord2f(state->texCoordX(curCoord), state->texCoordY(curCoord)); glTexCoord2f(state->texCoordX(curCoord), state->texCoordY(curCoord));
......
...@@ -68,7 +68,7 @@ class GEM_EXTERN GemShape : public GemBase ...@@ -68,7 +68,7 @@ class GEM_EXTERN GemShape : public GemBase
// GROUP: Utility functions // GROUP: Utility functions
//----------------------------------- //-----------------------------------
int SetVertix(GemState* state,float x, float y, float z, float tx, float ty,int curCoord); void SetVertix(GemState* state,float x, float y, float z, float tx, float ty,int curCoord);
//----------------------------------- //-----------------------------------
// GROUP: Member variables // GROUP: Member variables
......
...@@ -16,6 +16,11 @@ ...@@ -16,6 +16,11 @@
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
#include "GemState.h" #include "GemState.h"
// I hate Microsoft...I shouldn't have to do this!
#ifdef _WINDOWS
#include <windows.h>
#endif
#ifdef MACOSX #ifdef MACOSX
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
......
...@@ -15,7 +15,11 @@ ...@@ -15,7 +15,11 @@
#include "Base/GemState.h" #include "Base/GemState.h"
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#ifndef M_PI
#define M_PI 3.1415926535898
#endif
/* Grid */ /* Grid */
enum {WIREFRAME, HIDDENLINE, FLATSHADED, SMOOTHSHADED, TEXTURED}; enum {WIREFRAME, HIDDENLINE, FLATSHADED, SMOOTHSHADED, TEXTURED};
enum {FACENORMALS, ENVMAP}; enum {FACENORMALS, ENVMAP};
...@@ -241,7 +245,7 @@ void newWave :: getforce() ...@@ -241,7 +245,7 @@ void newWave :: getforce()
{ {
force[i][j] =0.0; force[i][j] =0.0;
} }
for (int i=2; i<grid-2; i++) for ( i=2; i<grid-2; i++)
for (int j=2;j<grid-2; j++) for (int j=2;j<grid-2; j++)
{ {
d = posit[i][j] - posit[i][j-1]; d = posit[i][j] - posit[i][j-1];
......
...@@ -12,6 +12,11 @@ ...@@ -12,6 +12,11 @@
*/ */
#ifndef INCLUDE_NEWWAVE_H_ #ifndef INCLUDE_NEWWAVE_H_
#define INCLUDE_NEWWAVE_H_ #define INCLUDE_NEWWAVE_H_
// I hate Microsoft...I shouldn't have to do this!
#ifdef _WINDOWS
#include <windows.h>
#endif
#ifdef MACOSX #ifdef MACOSX
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
......
...@@ -12,6 +12,11 @@ ...@@ -12,6 +12,11 @@
*/ */
#ifndef INCLUDE_RIPPLE_H_ #ifndef INCLUDE_RIPPLE_H_
#define INCLUDE_RIPPLE_H_ #define INCLUDE_RIPPLE_H_
// I hate Microsoft...I shouldn't have to do this!
#ifdef _WINDOWS
#include <windows.h>
#endif
#ifdef MACOSX #ifdef MACOSX
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
......
...@@ -12,6 +12,11 @@ ...@@ -12,6 +12,11 @@
*/ */
#ifndef INCLUDE_RUBBER_H_ #ifndef INCLUDE_RUBBER_H_
#define INCLUDE_RUBBER_H_ #define INCLUDE_RUBBER_H_
// I hate Microsoft...I shouldn't have to do this!
#ifdef _WINDOWS
#include <windows.h>
#endif
#ifdef MACOSX #ifdef MACOSX
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
......
...@@ -13,6 +13,11 @@ ...@@ -13,6 +13,11 @@
// WARRANTIES, see the file, "GEM.LICENSE.TERMS" in this distribution. // WARRANTIES, see the file, "GEM.LICENSE.TERMS" in this distribution.
// //
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
// I hate Microsoft...I shouldn't have to do this!
#ifdef _WINDOWS
#include <windows.h>
#endif
#ifdef MACOSX #ifdef MACOSX
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
......
...@@ -14,6 +14,11 @@ LOG ...@@ -14,6 +14,11 @@ LOG
#ifndef INCLUDE_WORLD_LIGHT_H_ #ifndef INCLUDE_WORLD_LIGHT_H_
#define INCLUDE_WORLD_LIGHT_H_ #define INCLUDE_WORLD_LIGHT_H_
// I hate Microsoft...I shouldn't have to do this!
#ifdef _WINDOWS
#include <windows.h>
#endif
#ifdef MACOSX #ifdef MACOSX
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
......
...@@ -54,7 +54,7 @@ pix_convolve :: pix_convolve(t_floatarg fRow, t_floatarg fCol) ...@@ -54,7 +54,7 @@ pix_convolve :: pix_convolve(t_floatarg fRow, t_floatarg fCol)
// zero out the matrix // zero out the matrix
for (int i = 0; i < m_cols * m_rows; i++) m_matrix[i] = 0.0; for (int i = 0; i < m_cols * m_rows; i++) m_matrix[i] = 0.0;
for (int i = 0; i < m_cols * m_rows; i++) m_imatrix[i] = 0; for (i = 0; i < m_cols * m_rows; i++) m_imatrix[i] = 0;
// insert a one for the default center value (identity matrix) // insert a one for the default center value (identity matrix)
m_matrix[ ((m_cols / 2 + 1) * m_rows) + (m_rows / 2 + 1) ] = 1.0; m_matrix[ ((m_cols / 2 + 1) * m_rows) + (m_rows / 2 + 1) ] = 1.0;
m_imatrix[ ((m_cols / 2 + 1) * m_rows) + (m_rows / 2 + 1) ] = 255; m_imatrix[ ((m_cols / 2 + 1) * m_rows) + (m_rows / 2 + 1) ] = 255;
...@@ -249,7 +249,7 @@ void pix_convolve :: matrixMess(int argc, t_atom *argv) ...@@ -249,7 +249,7 @@ void pix_convolve :: matrixMess(int argc, t_atom *argv)
} }
for (int i = 0; i < argc; i++) m_matrix[i] = atom_getfloat(&argv[i]); for (int i = 0; i < argc; i++) m_matrix[i] = atom_getfloat(&argv[i]);
for (int i = 0; i < argc; i++) m_imatrix[i] = (int)(atom_getfloat(&argv[i])*255.); for (i = 0; i < argc; i++) m_imatrix[i] = (int)(atom_getfloat(&argv[i])*255.);
setPixModified(); setPixModified();
} }
......
...@@ -29,8 +29,7 @@ CPPEXTERN_NEW_WITH_ONE_ARG(pix_videoNT, t_floatarg, A_DEFFLOAT) ...@@ -29,8 +29,7 @@ CPPEXTERN_NEW_WITH_ONE_ARG(pix_videoNT, t_floatarg, A_DEFFLOAT)
// //
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
pix_videoNT :: pix_videoNT(t_floatarg num) pix_videoNT :: pix_videoNT(t_floatarg num)
: m_haveVideo(0), m_swap(1), m_colorSwap(0), : m_hWndC(NULL), m_newFrame(0)
m_hWndC(NULL), m_newFrame(0)
{ {
char driverName[64]; char driverName[64];
char driverDesc[64]; char driverDesc[64];
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
*/ */
#include <stdint.h> //#include <stdint.h> not present in Windows and not required for compilation? drh
#include "yuv_posterize.h" #include "yuv_posterize.h"
CPPEXTERN_NEW(yuv_posterize) CPPEXTERN_NEW(yuv_posterize)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment