dmuratshin 9 years ago
parent
commit
b832af5bf3
3 changed files with 23 additions and 20 deletions
  1. 6 6
      oxygine/src/core/file.cpp
  2. 1 1
      oxygine/src/dev_tools/TexturesInspector.cpp
  3. 16 13
      tools/others/format.bat

+ 6 - 6
oxygine/src/core/file.cpp

@@ -39,13 +39,13 @@ namespace oxygine
         STDFileSystem _nfs(true);
         STDFileSystem _nfsWrite(false);
 
-		bool _fsInitialized = false;
+        bool _fsInitialized = false;
 
-		void init(const char* company, const char* app)
-		{
-			if (_fsInitialized)
-				return;
-			_fsInitialized = true;
+        void init(const char* company, const char* app)
+        {
+            if (_fsInitialized)
+                return;
+            _fsInitialized = true;
 
 #ifdef __S3E__
             _nfs.setPath("rom://");

+ 1 - 1
oxygine/src/dev_tools/TexturesInspector.cpp

@@ -13,7 +13,7 @@
 namespace oxygine
 {
     Vector2 fitSize(const Vector2& destSize, const Vector2& src);
-    const Vector2 itemSize(128.0f, 128.0f);
+    const Vector2 itemSize(256.0f, 256.0f);
 
     class TextureLine: public Box9Sprite
     {

+ 16 - 13
tools/others/format.bat

@@ -1,24 +1,27 @@
 set options=--recursive --style=allman --indent-switches --indent-namespaces --indent-preproc-define --pad-oper --pad-header --unpad-paren --align-pointer=type --convert-tabs  --formatted --lineend=windows --suffix=none --keep-one-line-blocks --keep-one-line-statements
 
 set astyle=d:\dropbox\tools\AStyle.exe
-%astyle% d:\oxygine-framework\oxygine\src\*.cpp d:\oxygine-framework\oxygine\src\*.h %options% --exclude=winnie_alloc --exclude=pugixml --exclude=minizip --exclude=closure --exclude=Tween.cpp
+set root=%CD%\..\..\..\
 
-%astyle% d:\oxygine-sound\src\*.cpp d:\oxygine-sound\src\*.h d:\oxygine-sound\examples\*.cpp d:\oxygine-sound\examples\*.h %options%
-%astyle% d:\oxygine-flow\src\*.cpp d:\oxygine-flow\src\*.h d:\oxygine-flow\examples\*.cpp d:\oxygine-flow\examples\*.h %options%
+echo %root%
+%astyle% %root%\oxygine-framework\oxygine\src\*.cpp d:\oxygine-framework\oxygine\src\*.h %options% --exclude=winnie_alloc --exclude=pugixml --exclude=minizip --exclude=closure --exclude=Tween.cpp
 
-%astyle% d:\oxygine-magicparticles\src\*.cpp d:\oxygine-magicparticles\src\*.h %options%
+%astyle% %root%\oxygine-sound\src\*.cpp %root%\oxygine-sound\src\*.h %root%\oxygine-sound\examples\*.cpp %root%\oxygine-sound\examples\*.h %options%
+%astyle% %root%\oxygine-flow\src\*.cpp %root%\oxygine-flow\src\*.h %root%\oxygine-flow\examples\*.cpp %root%\oxygine-flow\examples\*.h %options%
 
-%astyle% d:\oxygine-framework\examples\*.cpp d:\oxygine-framework\examples\*.h %options%  --exclude=box2d\box2d
+%astyle% %root%\oxygine-magicparticles\src\*.cpp %root%\oxygine-magicparticles\src\*.h %options%
 
-%astyle% d:\oxygine-movie\examples\*.cpp d:\oxygine-movie\examples\*.h %options%
-%astyle% d:\oxygine-movie\src\*.cpp d:\oxygine-movie\src\*.h %options%
+%astyle% %root%\oxygine-framework\examples\*.cpp %root%\oxygine-framework\examples\*.h %options%  --exclude=box2d\box2d
 
+%astyle% %root%\oxygine-movie\examples\*.cpp %root%\oxygine-movie\examples\*.h %options%
+%astyle% %root%\oxygine-movie\src\*.cpp %root%\oxygine-movie\src\*.h %options%
 
-%astyle% d:\oxygine-billing\examples\*.cpp d:\oxygine-billing\examples\*.h %options%
-%astyle% d:\oxygine-billing\src\*.cpp d:\oxygine-billing\src\*.h %options%
 
-%astyle% d:\oxygine-facebook\example\*.cpp d:\oxygine-facebook\example\*.h %options%
-%astyle% d:\oxygine-facebook\src\*.cpp d:\oxygine-facebook\src\*.h %options%
+%astyle% %root%\oxygine-billing\examples\*.cpp %root%\oxygine-billing\examples\*.h %options%
+%astyle% %root%\oxygine-billing\src\*.cpp %root%\oxygine-billing\src\*.h %options%
 
-%astyle% d:\oxygine-editor\editor\src\*.cpp d:\oxygine-editor\editor\src\*.h %options%
-%astyle% d:\oxygine-editor\examples\*.cpp d:\oxygine-editor\examples\*.h %options%
+%astyle% %root%\oxygine-facebook\example\*.cpp %root%\oxygine-facebook\example\*.h %options%
+%astyle% %root%\oxygine-facebook\src\*.cpp %root%\oxygine-facebook\src\*.h %options%
+
+%astyle% %root%\oxygine-editor\editor\src\*.cpp %root%\oxygine-editor\editor\src\*.h %options%
+%astyle% %root%\oxygine-editor\examples\*.cpp %root%\oxygine-editor\examples\*.h %options%