Browse Source

Added namespace, removed (obj-c) interface J

master
Joshua Moerman 13 years ago
parent
commit
4e9ac42d77
  1. 3
      J/J.h
  2. 15
      J/J.mm
  3. 4
      J/fbo.h
  4. 4
      J/shader.h

3
J/J.h

@ -11,6 +11,3 @@
#import "fbo.h"
#import "to_string.h"
@interface J : NSObject
@end

15
J/J.mm

@ -8,16 +8,5 @@
#import "J.h"
@implementation J
- (id)init
{
self = [super init];
if (self) {
// Initialization code here.
}
return self;
}
@end
// this is here, so that there is at least _something_ to compile...
// removing this file, was not a big succes...

4
J/fbo.h

@ -13,6 +13,8 @@
// TODO: more error checking in debug build.
// TODO: make texture class? for easier switching between linear/nearest interpolation for example
namespace J {
class fbo {
public:
typedef std::map<GLenum, GLuint> RenderbuffersMap;
@ -134,5 +136,7 @@ private:
}
};
} // namespace J
#endif // FBO_H

4
J/shader.h

@ -13,6 +13,8 @@
// TODO: do glValidateProgram, like in the OpenGL template
// TODO: add error checking at set_uniforms?
namespace J {
class shader {
typedef std::map<GLenum, GLuint> ShaderMap;
@ -182,5 +184,7 @@ private:
}
};
} // namespace J
#endif // SHADER_H