Add files via upload

paganswrath · Mar 27, 2023 · 7b6ef03 · 7b6ef03
1 parent 93fc8bf
commit 7b6ef03
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 66 deletions.
diff --git a/Source/Main.cpp b/Source/Main.cpp
@@ -19,11 +19,7 @@ int main(int argc, char *argv[])
     }
     else {
         LoadScript(argv[1]);
-
-
         BenchMode = true;
-
-
 
     }
 
@@ -32,16 +28,10 @@ int main(int argc, char *argv[])
         BeginDrawing();
         ClearBackground(BLACK);
 
-        if (BenchMode){
-            TimeCounter ++;
-
-            if (TimeCounter == 30 * 5){
-                cout << "Average Speed: " << (CycleCounter / TimeCounter) / 30 << " \n";
-                cout << "Cycle Score: " << (CycleCounter) / 30 * 5 << " \n";
-                exit(0);
-            }
+        for (int T = 0 ; T <= InstructionsPerTick ; T++){
+            CycleInstruction();
+            ParasiteScriptCoreData.LineCounter += 1;
         }
-        for (int i = 0 ; i <= ProcessSpeed ; i ++)ParasiteScriptInterperate();
 
         EndDrawing();
     }

diff --git a/Source/Parasite/ParasiteScript.hpp b/Source/Parasite/ParasiteScript.hpp
@@ -204,15 +204,14 @@ static bool TickFlag = false;
 static int CycleCounter = 0;
 static int TimeCounter = 0;
 
-void* CycleInstruction(void* VInstruction){
-    string Instruction = *static_cast<string*>(VInstruction);
+static int InstructionsPerTick = 8;
 
+auto CycleInstruction(){
     if (ParasiteScriptCoreData.LineCounter != ParasiteScriptCoreData.ProgramSize){
+        string Instruction = ParasiteScriptCoreData.Line[ParasiteScriptCoreData.LineCounter];
+
         if (SplitValue(Instruction, 0 ) == "stop"){
-
-        }
-        if (SplitValue(Instruction , 0 ) == "tick"){
-            TickFlag = true;
+            exit(0);
         }
 
         if (SplitValue(Instruction, 0 ) == "var" || SplitValue(Instruction, 0 ) == "spr"){
@@ -442,10 +441,6 @@ void* CycleInstruction(void* VInstruction){
                     }
                 }
             }
-
-            if (SplitValue(Instruction, 0 ) == "end"){   
-                exit(0);
-            }
 
             if (SplitValue(Instruction, 0 ) == "settextsize"){   
                 ParasiteScriptCoreData.TextSize = StringToInt(SplitValue(Instruction, 1 ));
@@ -697,47 +692,10 @@ void* CycleInstruction(void* VInstruction){
                         }
                     }
                 }
-            }
         }
+    }
 
     if (BenchMode){
         CycleCounter ++;
     }
 }
-
-static int InstructionsPerTick = 2;
-
-
-auto ParasiteScriptInterperate(){ // Quick Interperater
-    #if (defined(SingleCore))
-    for (int i = 0 ; i <= ParasiteScriptCoreData.ProgramSize ; i ++){
-        if (ParasiteScriptCoreData.LineCounter != ParasiteScriptCoreData.ProgramSize){
-
-            CycleInstruction(&ParasiteScriptCoreData.Line[ParasiteScriptCoreData.LineCounter]);
-            ParasiteScriptCoreData.LineCounter ++;
-
-            if (TickFlag){
-                TickFlag = false;
-                i = ParasiteScriptCoreData.ProgramSize;
-            }
-
-        }
-    }
-    #endif
-    #if (defined(MultiCore))
-    if (ParasiteScriptCoreData.LineCounter != ParasiteScriptCoreData.ProgramSize){
-
-        for (int i = 0; i <= InstructionsPerTick; i++){
-            pthread_t ChildThread;
-            pthread_create( &ChildThread, NULL, &CycleInstruction, &ParasiteScriptCoreData.Line[ParasiteScriptCoreData.LineCounter + i]);
-        }
-
-        ParasiteScriptCoreData.LineCounter += InstructionsPerTick;
-
-        if (TickFlag){
-            TickFlag = false;
-        }
-    }
-    #endif
-
-}
diff --git a/Source/System.hpp b/Source/System.hpp
@@ -198,7 +198,7 @@ void DisplayTerminal(){
                 break;
         }
 
-        DrawTextEx(PPGSystem.SystemFont, FormatText("%c", DisplayCharacter), {CharacterPlace * 14 , 12 * CharacterLine}, 15, 1, WHITE);
+        DrawTextEx(PPGSystem.SystemFont, TextFormat("%c", DisplayCharacter), {CharacterPlace * 14 , 12 * CharacterLine}, 15, 1, WHITE);
         CharacterPlace ++;
 
     }
@@ -261,7 +261,7 @@ void DisplayTerminal(){
                 TextEditorRunning = true;
                 TerminalRunning = false; // Launch Into App
 
-                FileName = FormatText("Apps/%ls.ps" ,AppName.c_str());
+                FileName = TextFormat("Apps/%ls.ps" ,AppName.c_str());
                 break;
             }
 
@@ -286,9 +286,9 @@ void DisplayTerminal(){
                     AppName += PPGSystem.TerminalData[x];
                 }
 
-                cout << FormatText("Apps/%ls.ps" ,AppName.c_str());
+                cout << TextFormat("Apps/%ls.ps" ,AppName.c_str());
 
-                LoadScript(FormatText("Apps/%ls.ps" ,AppName.c_str()));
+                LoadScript(TextFormat("Apps/%ls.ps" ,AppName.c_str()));
                 TerminalRunning = false; // Launch Into App
                 break;
             }
@@ -450,7 +450,7 @@ void StartMenu(){
             }
 
             DrawRectangle(198 , 18 , 24 *  3.75, 10 , BLACK);
-            DrawTextEx(PPGSystem.SystemFont , FormatText("Sprite Size: %i" ,SpriteEditorSize + 1) , { 200 , 20 } , 8 , 1 , WHITE );
+            DrawTextEx(PPGSystem.SystemFont , TextFormat("Sprite Size: %i" ,SpriteEditorSize + 1) , { 200 , 20 } , 8 , 1 , WHITE );
 
 
         }