dmuratshin vor 9 Jahren
Ursprung
Commit
4cfb6ce5b8
4 geänderte Dateien mit 7 neuen und 7 gelöschten Zeilen
  1. 1 1
      oxygine/src/Sprite.cpp
  2. 1 1
      oxygine/src/Sprite.h
  3. 4 4
      oxygine/src/core/gl/oxgl.cpp
  4. 1 1
      oxygine/src/core/gl/oxgl.h

+ 1 - 1
oxygine/src/Sprite.cpp

@@ -167,7 +167,7 @@ namespace oxygine
         setAnimFrame(rs, column, row);
     }
 
-    void Sprite::setLocalScale(const Vector2 &s)
+    void Sprite::setLocalScale(const Vector2& s)
     {
         _localScale = s;
         _setSize(_frame.getSize().mult(_localScale));

+ 1 - 1
oxygine/src/Sprite.h

@@ -40,7 +40,7 @@ namespace oxygine
         void                    setRow(int row);
         void                    setColumn(int column);
         void                    setColumnRow(int column, int row);
-        void                    setLocalScale(const Vector2 &s);
+        void                    setLocalScale(const Vector2& s);
 
         bool                    isOn(const Vector2& localPosition);
 

+ 4 - 4
oxygine/src/core/gl/oxgl.cpp

@@ -66,8 +66,8 @@ extern "C"
     {}
     GLAPI void APIENTRY def_glUniform1i(GLint location, GLint v0)
     {}
-	GLAPI void APIENTRY def_glUniform2f(GLint location, GLfloat v0, GLfloat v1)
-	{}
+    GLAPI void APIENTRY def_glUniform2f(GLint location, GLfloat v0, GLfloat v1)
+    {}
     GLAPI void APIENTRY def_glUniform2fv(GLint location, GLsizei count, const GLfloat* value)
     {}
     GLAPI void APIENTRY def_glUniform3fv(GLint location, GLsizei count, const GLfloat* value)
@@ -145,7 +145,7 @@ extern "C"
     PFNGLGETATTRIBLOCATIONPROC _glGetAttribLocation = 0;
     PFNGLLINKPROGRAMPROC _glLinkProgram = 0;
     PFNGLUNIFORM1IPROC _glUniform1i = 0;
-	PFNGLUNIFORM2FPROC _glUniform2f = 0;
+    PFNGLUNIFORM2FPROC _glUniform2f = 0;
     PFNGLUNIFORM2FVPROC _glUniform2fv = 0;
     PFNGLUNIFORM3FVPROC _glUniform3fv = 0;
     PFNGLUNIFORM4FVPROC _glUniform4fv = 0;
@@ -198,7 +198,7 @@ int initGLExtensions(myGetProcAdress func)
     GETFUNC(_glGetAttribLocation, def_glGetAttribLocation, PFNGLGETATTRIBLOCATIONPROC, "glGetAttribLocation");
     GETFUNC(_glLinkProgram, def_glLinkProgram, PFNGLLINKPROGRAMPROC, "glLinkProgram");
     GETFUNC(_glUniform1i, def_glUniform1i, PFNGLUNIFORM1IPROC, "glUniform1i");
-	GETFUNC(_glUniform2f, def_glUniform2f, PFNGLUNIFORM2FPROC, "glUniform2f");
+    GETFUNC(_glUniform2f, def_glUniform2f, PFNGLUNIFORM2FPROC, "glUniform2f");
     GETFUNC(_glUniform2fv, def_glUniform2fv, PFNGLUNIFORM2FVPROC, "glUniform2fv");
     GETFUNC(_glUniform3fv, def_glUniform3fv, PFNGLUNIFORM3FVPROC, "glUniform3fv");
     GETFUNC(_glUniform4fv, def_glUniform4fv, PFNGLUNIFORM4FVPROC, "glUniform4fv");

+ 1 - 1
oxygine/src/core/gl/oxgl.h

@@ -43,7 +43,7 @@ extern "C"
     extern PFNGLLINKPROGRAMPROC _glLinkProgram;
     extern PFNGLUNIFORM1IPROC _glUniform1i;
     extern PFNGLUNIFORM2FVPROC _glUniform2fv;
-	extern PFNGLUNIFORM2FPROC _glUniform2f;
+    extern PFNGLUNIFORM2FPROC _glUniform2f;
     extern PFNGLUNIFORM3FVPROC _glUniform3fv;
     extern PFNGLUNIFORM4FVPROC _glUniform4fv;
     extern PFNGLUNIFORM1FPROC _glUniform1f;