Commit 0080b408 authored by zmoelnig's avatar zmoelnig
Browse files

removed GemState.h from GemBase.h; so we have to re-included manually where

needed


git-svn-id: https://pd-gem.svn.sourceforge.net/svnroot/pd-gem/trunk/Gem@3109 49b2a0ca-c541-4d49-a7ef-d785e4371512
parent 65cbceb9
......@@ -16,14 +16,12 @@
#define INCLUDE_GEMBASE_H_
#include "Base/GemGL.h"
#include "Base/GemContextData.h"
#include "Base/CPPExtern.h"
#include "Base/GemState.h"
#include "Base/GemContextData.h"
class GemCache;
class GemState;
/*-----------------------------------------------------------------
-------------------------------------------------------------------
CLASS
......
......@@ -19,6 +19,7 @@
#include "GemPixDualObj.h"
#include "GemCache.h"
#include "GemState.h"
#include <string.h>
#include <stdio.h>
......
......@@ -17,6 +17,7 @@
#include "GemPixObj.h"
#include "GemCache.h"
#include "GemState.h"
/////////////////////////////////////////////////////////
//
......
......@@ -16,6 +16,7 @@
/////////////////////////////////////////////////////////
#include "GemShape.h"
#include "GemState.h"
#include <ctype.h>
/////////////////////////////////////////////////////////
//
......
......@@ -15,7 +15,6 @@
/////////////////////////////////////////////////////////
#include "gemlist.h"
#include "Base/GemState.h"
#include "Base/GemCache.h"
#include "Base/GemMan.h"
......
......@@ -16,6 +16,7 @@
#define INCLUDE_GEMLIST_H_
#include "Base/GemBase.h"
#include "Base/GemState.h"
/*-----------------------------------------------------------------
-------------------------------------------------------------------
......
......@@ -19,9 +19,8 @@
////////////////////////////////////////////////////////
#include "cuboid.h"
#ifdef __APPLE__
#include "Base/GemState.h"
#include "string.h"
#endif
CPPEXTERN_NEW_WITH_THREE_ARGS(cuboid, t_floatarg, A_DEFFLOAT, t_floatarg, A_DEFFLOAT, t_floatarg, A_DEFFLOAT )
......
......@@ -13,7 +13,7 @@
/////////////////////////////////////////////////////////
#include "curve.h"
#include "Base/GemState.h"
#include <string.h>
CPPEXTERN_NEW_WITH_ONE_ARG(curve, t_floatarg, A_DEFFLOAT)
......
......@@ -15,6 +15,7 @@
/////////////////////////////////////////////////////////
#include "cylinder.h"
#include "Base/GemState.h"
CPPEXTERN_NEW_WITH_TWO_ARGS(cylinder, t_floatarg, A_DEFFLOAT, t_floatarg, A_DEFFLOAT)
......
......@@ -21,6 +21,7 @@
/////////////////////////////////////////////////////////
#include "disk.h"
#include "Base/GemState.h"
CPPEXTERN_NEW_WITH_GIMME(disk)
......
......@@ -21,6 +21,7 @@
#endif
#include "imageVert.h"
#include "Base/GemState.h"
CPPEXTERN_NEW(imageVert)
......
......@@ -15,7 +15,8 @@
/////////////////////////////////////////////////////////
#include "model.h"
#include "Base/GemState.h"
CPPEXTERN_NEW_WITH_ONE_ARG(model, t_symbol *, A_DEFSYM)
/////////////////////////////////////////////////////////
......
......@@ -14,7 +14,7 @@
//
/////////////////////////////////////////////////////////
#include "multimodel.h"
#include "Base/GemState.h"
#include <stdio.h>
CPPEXTERN_NEW_WITH_FOUR_ARGS(multimodel, t_symbol *, A_DEFSYM, t_floatarg, A_DEFFLOAT, t_floatarg, A_DEFFLOAT, t_floatarg, A_DEFFLOAT)
......
......@@ -13,6 +13,7 @@
*/
#include "newWave.h"
#include "Base/GemState.h"
/* Grid */
enum {WIREFRAME, HIDDENLINE, FLATSHADED, SMOOTHSHADED, TEXTURED};
......
......@@ -14,7 +14,6 @@
#define INCLUDE_NEWWAVE_H_
#include "Base/GemShape.h"
#include "Base/GemState.h"
#include "Base/GemFuncUtil.h"
#ifdef __ppc__
......
......@@ -13,7 +13,7 @@
/////////////////////////////////////////////////////////
#include "pqtorusknots.h"
#include "Base/GemState.h"
#define PI2 3.1415926535897932384626433832795f*2
CPPEXTERN_NEW_WITH_TWO_ARGS(pqtorusknots, t_floatarg, A_DEFFLOAT, t_floatarg, A_DEFFLOAT )
......
......@@ -12,6 +12,7 @@
*/
#include "ripple.h"
#include "Base/GemState.h"
CPPEXTERN_NEW_WITH_TWO_ARGS(ripple, t_floatarg, A_DEFFLOAT, t_floatarg, A_DEFFLOAT)
......
......@@ -14,7 +14,6 @@
#define INCLUDE_RIPPLE_H_
#include "Base/GemShape.h"
#include "Base/GemState.h"
#include "Base/GemMan.h"
#include <string.h>
#include <math.h>
......
......@@ -12,6 +12,7 @@
*/
#include "rubber.h"
#include "Base/GemState.h"
#define GRID_SIZE_X 32
#define GRID_SIZE_Y 32
......
......@@ -15,7 +15,6 @@
#define INCLUDE_RUBBER_H_
#include "Base/GemShape.h"
#include "Base/GemState.h"
#include "Base/GemMan.h"
#include <stdlib.h>
#include <stdio.h>
......
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