Commit: 817fa5e711c9d18c981be17b76b3edc04ed92d33 - HotshotIOS (hg)

Commit MetaInfo

• Revision: 817fa5e711c9d18c981be17b76b3edc04ed92d33 (tree)
• Zeit: 2021-04-26 05:16:36
• Autor: sebastian_bugiu
• Commiter: sebastian_bugiu

Log Message

Removed prints.

Ändern Zusammenfassung

• modified: core/src/headwayent/blackholedarksun/physics/EntityContactListener.java
• modified: core/src/headwayent/blackholedarksun/systems/AISystem.java
• modified: core/src/headwayent/hotshotengine/ENG_MainThread.java
• modified: core/src/headwayent/hotshotengine/audio/ENG_SoundManager.java
• modified: core/src/headwayent/hotshotengine/renderer/ENG_SceneManager.java
• modified: core/src/headwayent/hotshotengine/renderer/nativeinterface/pipeline/ENG_RenderingThread.java
• modified: desktop/raw/robovm.ini

Diff

diff -r 2cf76c2f1e77 -r 817fa5e711c9 core/src/headwayent/blackholedarksun/physics/EntityContactListener.java
--- a/core/src/headwayent/blackholedarksun/physics/EntityContactListener.java	Sun Apr 25 09:58:23 2021 +0300
+++ b/core/src/headwayent/blackholedarksun/physics/EntityContactListener.java	Sun Apr 25 23:16:36 2021 +0300
@@ -201,7 +201,7 @@
                 if (entityProperties.getHealth() <= 0) {
                     collisionResolved = false;
                     entityDestroyed = true;
-                    System.out.println("Entity: " + entityProperties.getName() + " destroyed");
+//                    System.out.println("Entity: " + entityProperties.getName() + " destroyed");
                 }
 
             }

diff -r 2cf76c2f1e77 -r 817fa5e711c9 core/src/headwayent/blackholedarksun/systems/AISystem.java
--- a/core/src/headwayent/blackholedarksun/systems/AISystem.java	Sun Apr 25 09:58:23 2021 +0300
+++ b/core/src/headwayent/blackholedarksun/systems/AISystem.java	Sun Apr 25 23:16:36 2021 +0300
@@ -524,7 +524,7 @@
                                 MainApp.getGame().getWorldManager().createCountermeasures(e);
                                 shipProperties.setAfterburnerActive(true);
                                 shipProperties.setCountermeasuresLastLaunchTime();
-                                System.out.println("Creating countermeasure for entity: " + entityProperties.getName());
+//                                System.out.println("Creating countermeasure for entity: " + entityProperties.getName());
                             }
                         }
                         EntityProperties projectileEntityProperties = entityPropertiesMapper.get(minDistProjectile);

diff -r 2cf76c2f1e77 -r 817fa5e711c9 core/src/headwayent/hotshotengine/ENG_MainThread.java
--- a/core/src/headwayent/hotshotengine/ENG_MainThread.java	Sun Apr 25 09:58:23 2021 +0300
+++ b/core/src/headwayent/hotshotengine/ENG_MainThread.java	Sun Apr 25 23:16:36 2021 +0300
@@ -1,5 +1,7 @@
 package headwayent.hotshotengine;
 
+import com.badlogic.gdx.Gdx;
+
 import headwayent.blackholedarksun.APP_Game;
 import headwayent.blackholedarksun.MainActivity;
 import headwayent.blackholedarksun.automationframework.AutomationFramework;
@@ -327,7 +329,24 @@
 //        long beginFrame = System.currentTimeMillis();
 //        long endFrame = 0;
 //        int frameNum = 0;
+        long lastGCTime = 0;
+        long averageCycleTime = ENG_Utility.currentTimeMillis();
+        final int averageStepNum = 100;
+        int currentStep = 0;
             while (true) {
+                if ((++currentStep) == averageStepNum) {
+                    currentStep = 0;
+                    long currentTime = ENG_Utility.currentTimeMillis();
+                    System.out.println("average FPS: " + ((currentTime - averageCycleTime) / (float) averageStepNum));
+                    averageCycleTime = currentTime;
+                }
+//                if (ENG_Utility.hasTimePassed(lastGCTime, 5000)) {
+//                    lastGCTime = ENG_Utility.currentTimeMillis();
+////                    System.gc();
+//                    System.out.println("System.gc() duration: " +
+//                            (ENG_Utility.currentTimeMillis() - lastGCTime) +  " java heap: " + Gdx.app.getJavaHeap() + " native heap: " + Gdx.app.getNativeHeap());
+//                }
+
 //                long mainLoopBeginTime = currentTimeMillis();
 //                if (MainApp.getApplicationMode() == MainApp.Mode.SERVER) {
 //                    if (MainApp.getGame().isGameEnded()) {

diff -r 2cf76c2f1e77 -r 817fa5e711c9 core/src/headwayent/hotshotengine/audio/ENG_SoundManager.java
--- a/core/src/headwayent/hotshotengine/audio/ENG_SoundManager.java	Sun Apr 25 09:58:23 2021 +0300
+++ b/core/src/headwayent/hotshotengine/audio/ENG_SoundManager.java	Sun Apr 25 23:16:36 2021 +0300
@@ -94,7 +94,7 @@
     public static final int MAX_CONCURRENT_SOUNDS = 16;
     public static final int MAX_SOUND_VOLUME = 100;
     public static final int SOUND_LOWEST_PRIORITY = 999;
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
     public static final boolean IGNORE_SOUND = false; // For faster loading on mobile
     public static final boolean FORCE_PLAY = true;
     private final HashMap<String, SoundInternal> sounds = new HashMap<>();
@@ -230,13 +230,17 @@
         // Remove sounds that have finished playing from the active sounds list.
         removeFinishedSounds();
 
-        System.out.println("Current active sounds num: " + activeSounds.size());
-        System.out.println("Attempting to play " + soundToBePlayed.getName() + " with default priority " + soundToBePlayed.getPriority());
+        if (DEBUG) {
+            System.out.println("Current active sounds num: " + activeSounds.size());
+            System.out.println("Attempting to play " + soundToBePlayed.getName() + " with default priority " + soundToBePlayed.getPriority());
+        }
 
         // If we still have all sounds playing we need to try to make room for the new
         // sound based on priority.
         if (activeSounds.size() == MAX_CONCURRENT_SOUNDS) {
-            System.out.println("Max concurrent sounds " + MAX_CONCURRENT_SOUNDS + " reached");
+            if (DEBUG) {
+                System.out.println("Max concurrent sounds " + MAX_CONCURRENT_SOUNDS + " reached");
+            }
             ActiveSound activeSoundWithLowestPriority = null;
             for (ActiveSound activeSound : activeSounds) {
                 if (activeSoundWithLowestPriority == null ||
@@ -248,16 +252,20 @@
             // then we selected the one longest playing. If the new sound has the same
             // priority then we evict the one with the same priority but longest playing.
             if (activeSoundWithLowestPriority.getCurrentPriority() >= soundToBePlayed.getPriority()) {
-                System.out.println("Evicting sound " +
-                        activeSoundWithLowestPriority.getSound().getName() +
-                        " with lowest priority " +
-                        activeSoundWithLowestPriority.getCurrentPriority() +
-                        " to make room for " + soundToBePlayed.getName() +
-                        " with priority " + soundToBePlayed.getPriority());
+                if (DEBUG) {
+                    System.out.println("Evicting sound " +
+                            activeSoundWithLowestPriority.getSound().getName() +
+                            " with lowest priority " +
+                            activeSoundWithLowestPriority.getCurrentPriority() +
+                            " to make room for " + soundToBePlayed.getName() +
+                            " with priority " + soundToBePlayed.getPriority());
+                }
                 activeSounds.remove(activeSoundWithLowestPriority);
                 stopSound(activeSoundWithLowestPriority.getSound(), activeSoundWithLowestPriority.getPlayId());
             } else {
-                System.out.println("Sound " + soundToBePlayed.getName() + " with default priority " + soundToBePlayed.getPriority() + " could not be played");
+                if (DEBUG) {
+                    System.out.println("Sound " + soundToBePlayed.getName() + " with default priority " + soundToBePlayed.getPriority() + " could not be played");
+                }
                 return false;
             }
         }
@@ -418,9 +426,12 @@
             for (Iterator<ActiveSound> iterator = activeSounds.iterator(); iterator.hasNext(); ) {
                 ActiveSound activeSound = iterator.next();
                 if (activeSound.getPlayId() == id) {
-                    System.out.println("Removing sound by stopping " + activeSound.getSound().getName() +
-                            " with play id " + activeSound.getPlayId() +
-                            " and priority " + activeSound.getCurrentPriority());
+                    if (DEBUG) {
+                        System.out.println("Removing sound by stopping " + activeSound.getSound().getName() +
+                                " with play id " + activeSound.getPlayId() +
+                                " and" +
+                                " priority " + activeSound.getCurrentPriority());
+                    }
                     iterator.remove();
                 }
             }

diff -r 2cf76c2f1e77 -r 817fa5e711c9 core/src/headwayent/hotshotengine/renderer/ENG_SceneManager.java
--- a/core/src/headwayent/hotshotengine/renderer/ENG_SceneManager.java	Sun Apr 25 09:58:23 2021 +0300
+++ b/core/src/headwayent/hotshotengine/renderer/ENG_SceneManager.java	Sun Apr 25 23:16:36 2021 +0300
@@ -419,12 +419,12 @@
         if (MainActivity.isDebugmode()) {
             if (nativeObject instanceof ENG_MovableObject) {
                 ENG_MovableObject movableObject = (ENG_MovableObject) nativeObject;
-                System.out.println("Ptr: " + ptr + " linked to movable object: " + movableObject.getName());
+//                System.out.println("Ptr: " + ptr + " linked to movable object: " + movableObject.getName());
             } else if (nativeObject instanceof ENG_Item) {
                 ENG_Item item = (ENG_Item) nativeObject;
-                System.out.println("Ptr: " + ptr + " linked to item: " + item.getName());
+//                System.out.println("Ptr: " + ptr + " linked to item: " + item.getName());
             } else {
-                System.out.println("Ptr: " + ptr + " linked to nativeObject class: " + nativeObject.getClass().getName());
+//                System.out.println("Ptr: " + ptr + " linked to nativeObject class: " + nativeObject.getClass().getName());
             }
         }
         if (put != null) {
@@ -434,7 +434,7 @@
                         ". Trying to add the same pointer with movable object: " + movableObject.getName());
             } else if (nativeObject instanceof ENG_Item) {
                 ENG_Item item = (ENG_Item) nativeObject;
-                System.out.println("Ptr: " + ptr + " linked to item: " + item.getName());
+//                System.out.println("Ptr: " + ptr + " linked to item: " + item.getName());
             } else {
                 throw new IllegalArgumentException("Ptr: " + ptr +
                         " already linked to native object. nativeObject class: " + nativeObject.getClass().getName());
@@ -451,12 +451,12 @@
         if (MainActivity.isDebugmode()) {
             if (remove instanceof ENG_MovableObject) {
                 ENG_MovableObject movableObject = (ENG_MovableObject) remove;
-                System.out.println("removing Ptr: " + ptr + " linked to movable object: " + movableObject.getName());
+//                System.out.println("removing Ptr: " + ptr + " linked to movable object: " + movableObject.getName());
             } else if (remove instanceof ENG_Item) {
                 ENG_Item item = (ENG_Item) remove;
-                System.out.println("removing Ptr: " + ptr + " linked to item: " + item.getName());
+//                System.out.println("removing Ptr: " + ptr + " linked to item: " + item.getName());
             } else {
-                System.out.println("removing ptr: " + ptr + " nativeObject class: " + remove.getClass().getName());
+//                System.out.println("removing ptr: " + ptr + " nativeObject class: " + remove.getClass().getName());
             }
         }
         if (remove == null) {

diff -r 2cf76c2f1e77 -r 817fa5e711c9 core/src/headwayent/hotshotengine/renderer/nativeinterface/pipeline/ENG_RenderingThread.java
--- a/core/src/headwayent/hotshotengine/renderer/nativeinterface/pipeline/ENG_RenderingThread.java	Sun Apr 25 09:58:23 2021 +0300
+++ b/core/src/headwayent/hotshotengine/renderer/nativeinterface/pipeline/ENG_RenderingThread.java	Sun Apr 25 23:16:36 2021 +0300
@@ -537,6 +537,7 @@
         try {
             if (shouldSleepRenderingThread) {
                 shouldSleepRenderingThread = false;
+//                System.out.println("Releasing rendering thread");
                 sleepRenderingThreadSemaphore.release();
             }
 

diff -r 2cf76c2f1e77 -r 817fa5e711c9 desktop/raw/robovm.ini
--- a/desktop/raw/robovm.ini	Sun Apr 25 09:58:23 2021 +0300
+++ b/desktop/raw/robovm.ini	Sun Apr 25 23:16:36 2021 +0300
@@ -1,2 +1,1 @@
-ms256M
-EnableGCHeapStats
\ No newline at end of file
+ms256M
\ No newline at end of file