Skip to content

Commit

Permalink
Rename BytecodeObject to ScriptEntity
Browse files Browse the repository at this point in the history
  • Loading branch information
Lactozilla committed Dec 14, 2023
1 parent 7af2b08 commit 2daa742
Show file tree
Hide file tree
Showing 13 changed files with 124 additions and 125 deletions.
2 changes: 1 addition & 1 deletion VisualC/HatchGameEngine.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,9 @@ CD ..</Command>
<ClCompile Include="..\source\engine\bytecode\TypeImpl\FunctionImpl.cpp" />
<ClCompile Include="..\source\engine\bytecode\TypeImpl\MapImpl.cpp" />
<ClCompile Include="..\source\engine\bytecode\Bytecode.cpp" />
<ClCompile Include="..\source\engine\bytecode\BytecodeObject.cpp" />
<ClCompile Include="..\source\engine\bytecode\Compiler.cpp" />
<ClCompile Include="..\source\engine\bytecode\GarbageCollector.cpp" />
<ClCompile Include="..\source\engine\bytecode\ScriptEntity.cpp" />
<ClCompile Include="..\source\engine\bytecode\ScriptManager.cpp" />
<ClCompile Include="..\source\engine\bytecode\SourceFileMap.cpp" />
<ClCompile Include="..\source\engine\bytecode\StandardLibrary.cpp" />
Expand Down
6 changes: 3 additions & 3 deletions VisualC/HatchGameEngine.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
<ClCompile Include="..\source\engine\bytecode\Bytecode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\source\engine\bytecode\BytecodeObject.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\source\engine\bytecode\Compiler.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\source\engine\bytecode\GarbageCollector.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\source\engine\bytecode\ScriptEntity.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\source\engine\bytecode\ScriptManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down
4 changes: 2 additions & 2 deletions source/Engine/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class Application {
#include <Engine/Graphics.h>

#include <Engine/Bytecode/ScriptManager.h>
#include <Engine/Bytecode/BytecodeObject.h>
#include <Engine/Bytecode/ScriptEntity.h>
#include <Engine/Bytecode/GarbageCollector.h>
#include <Engine/Bytecode/SourceFileMap.h>
#include <Engine/Diagnostics/Clock.h>
Expand Down Expand Up @@ -517,7 +517,7 @@ PRIVATE STATIC void Application::Restart() {
Graphics::SpriteSheetTextureMap->Clear();

ScriptManager::LoadAllClasses = false;
BytecodeObject::DisableAutoAnimate = false;
ScriptEntity::DisableAutoAnimate = false;

Graphics::Reset();

Expand Down
6 changes: 3 additions & 3 deletions source/Engine/Bytecode/GarbageCollector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class GarbageCollector {

#include <Engine/Bytecode/GarbageCollector.h>

#include <Engine/Bytecode/BytecodeObject.h>
#include <Engine/Bytecode/ScriptEntity.h>
#include <Engine/Bytecode/ScriptManager.h>
#include <Engine/Bytecode/Compiler.h>
#include <Engine/Diagnostics/Clock.h>
Expand Down Expand Up @@ -72,15 +72,15 @@ PUBLIC STATIC void GarbageCollector::Collect() {
for (Entity* ent = Scene::StaticObjectFirst, *next; ent; ent = next) {
next = ent->NextEntity;

BytecodeObject* bobj = (BytecodeObject*)ent;
ScriptEntity* bobj = (ScriptEntity*)ent;
GrayObject(bobj->Instance);
GrayHashMap(bobj->Properties);
}
// Mark dynamic objects
for (Entity* ent = Scene::DynamicObjectFirst, *next; ent; ent = next) {
next = ent->NextEntity;

BytecodeObject* bobj = (BytecodeObject*)ent;
ScriptEntity* bobj = (ScriptEntity*)ent;
GrayObject(bobj->Instance);
GrayHashMap(bobj->Properties);
}
Expand Down
Loading

0 comments on commit 2daa742

Please sign in to comment.