Code-style consistency improvement:
Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files. make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type. This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
@@ -5,21 +5,19 @@
|
||||
struct PrimInternalData;
|
||||
class GLPrimitiveRenderer;
|
||||
|
||||
struct InternalOpenGL2RenderCallbacks : public RenderCallbacks
|
||||
struct InternalOpenGL2RenderCallbacks : public RenderCallbacks
|
||||
{
|
||||
|
||||
virtual PrimInternalData* getData()=0;
|
||||
virtual PrimInternalData* getData() = 0;
|
||||
|
||||
virtual ~InternalOpenGL2RenderCallbacks();
|
||||
|
||||
virtual void updateTexture(sth_texture* texture, sth_glyph* glyph, int textureWidth, int textureHeight);
|
||||
virtual void render(sth_texture* texture);
|
||||
|
||||
|
||||
void display2();
|
||||
|
||||
};
|
||||
|
||||
void dumpTextureToPng( int screenWidth, int screenHeight, const char* fileName);
|
||||
void dumpTextureToPng(int screenWidth, int screenHeight, const char* fileName);
|
||||
|
||||
struct SimpleOpenGL2RenderCallbacks : public InternalOpenGL2RenderCallbacks
|
||||
{
|
||||
@@ -29,7 +27,7 @@ struct SimpleOpenGL2RenderCallbacks : public InternalOpenGL2RenderCallbacks
|
||||
return m_data;
|
||||
}
|
||||
SimpleOpenGL2RenderCallbacks(PrimInternalData* data)
|
||||
:m_data(data)
|
||||
: m_data(data)
|
||||
{
|
||||
}
|
||||
virtual ~SimpleOpenGL2RenderCallbacks()
|
||||
@@ -37,23 +35,17 @@ struct SimpleOpenGL2RenderCallbacks : public InternalOpenGL2RenderCallbacks
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
struct OpenGL2RenderCallbacks : public InternalOpenGL2RenderCallbacks
|
||||
struct OpenGL2RenderCallbacks : public InternalOpenGL2RenderCallbacks
|
||||
{
|
||||
GLPrimitiveRenderer* m_primRender2;
|
||||
virtual PrimInternalData* getData();
|
||||
|
||||
virtual void setWorldPosition(float pos[3]){}
|
||||
virtual void setWorldOrientation(float orn[4]){}
|
||||
virtual void setColorRGBA(float color[4]){}
|
||||
|
||||
virtual void setWorldPosition(float pos[3]) {}
|
||||
virtual void setWorldOrientation(float orn[4]) {}
|
||||
virtual void setColorRGBA(float color[4]) {}
|
||||
|
||||
OpenGL2RenderCallbacks(GLPrimitiveRenderer* primRender);
|
||||
virtual ~OpenGL2RenderCallbacks();
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
#endif//_OPENGL_FONTSTASH_CALLBACKS_H
|
||||
|
||||
#endif //_OPENGL_FONTSTASH_CALLBACKS_H
|
||||
|
||||
Reference in New Issue
Block a user