Skip to content

Commit

Permalink
Code quality
Browse files Browse the repository at this point in the history
  • Loading branch information
@nepp95
nepp95 committed Dec 19, 2024
1 parent 4cfda25 commit 2de9571
Show file tree
Hide file tree
Showing 6 changed files with 87 additions and 87 deletions.
10 changes: 5 additions & 5 deletions EppoEngine/Source/Scripting/ScriptEngine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ namespace Eppo
static bool LoadCoreAssembly(const std::filesystem::path& filepath);
static void LoadAssemblyClasses();

static void OnAppAssemblyFileSystemEvent(const std::filesystem::path& filepath, const filewatch::Event changeType);
static void OnAppAssemblyFileSystemEvent(const std::filesystem::path& filepath, filewatch::Event changeType);
};

namespace Utils
{
inline ScriptFieldType ScriptFieldTypeFromString(std::string_view typeString)
inline ScriptFieldType ScriptFieldTypeFromString(const std::string_view typeString)
{
if (typeString == "Float") return ScriptFieldType::Float;
if (typeString == "Double") return ScriptFieldType::Double;
Expand All @@ -83,11 +83,11 @@ namespace Eppo
if (typeString == "Vector4") return ScriptFieldType::Vector4;
if (typeString == "Entity") return ScriptFieldType::Entity;

EPPO_ASSERT(false);
EPPO_ASSERT(false)
return ScriptFieldType::None;
}

inline std::string ScriptFieldTypeToString(ScriptFieldType type)
inline std::string ScriptFieldTypeToString(const ScriptFieldType type)
{
switch (type)
{
Expand All @@ -108,7 +108,7 @@ namespace Eppo
case ScriptFieldType::Entity: return "Entity";
}

EPPO_ASSERT(false);
EPPO_ASSERT(false)
return "None";
}
}
Expand Down
2 changes: 1 addition & 1 deletion EppoEngine/Source/Scripting/ScriptField.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ typedef struct _MonoClassField MonoClassField;

namespace Eppo
{
enum class ScriptFieldType
enum class ScriptFieldType : uint8_t
{
None = 0,
Float, Double,
Expand Down
118 changes: 59 additions & 59 deletions EppoEngine/Source/Scripting/ScriptGlue.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ namespace Eppo

#define EPPO_ADD_INTERNAL_CALL(fn) mono_add_internal_call("Eppo.InternalCalls::"#fn, fn);

static void Log(uint32_t logLevel, MonoString* message)
static void Log(const uint32_t logLevel, MonoString* message)
{
EPPO_PROFILE_FUNCTION("ScriptGlue::Log");

char* cStr = mono_string_to_utf8(message);
std::string messageStr(cStr);
const std::string messageStr(cStr);
mono_free(cStr);

switch (logLevel)
Expand All @@ -32,24 +32,24 @@ namespace Eppo
}
}

static bool Input_IsKeyPressed(KeyCode keyCode)
static bool Input_IsKeyPressed(const KeyCode keyCode)
{
EPPO_PROFILE_FUNCTION("ScriptGlue::Input_IsKeyPressed");

return Input::IsKeyPressed(keyCode);
}

static void Entity_AddComponent(UUID uuid, MonoString* componentType)
static void Entity_AddComponent(const UUID uuid, MonoString* componentType)
{
EPPO_PROFILE_FUNCTION("ScriptGlue::Entity_AddComponent");

Ref<Scene> scene = ScriptEngine::GetSceneContext();
EPPO_ASSERT(scene);
const Ref<Scene> scene = ScriptEngine::GetSceneContext();
EPPO_ASSERT(scene)
Entity entity = scene->FindEntityByUUID(uuid);
EPPO_ASSERT(entity);
EPPO_ASSERT(entity)

char* cStr = mono_string_to_utf8(componentType);
std::string componentTypeStr(cStr);
const std::string componentTypeStr(cStr);
mono_free(cStr);

if (componentTypeStr == "TransformComponent")
Expand All @@ -70,15 +70,15 @@ namespace Eppo
{
EPPO_PROFILE_FUNCTION("ScriptGlue::Entity_CreateNewEntity");

Ref<Scene> scene = ScriptEngine::GetSceneContext();
EPPO_ASSERT(scene);
const Ref<Scene> scene = ScriptEngine::GetSceneContext();
EPPO_ASSERT(scene)

char* cStr = mono_string_to_utf8(name);
std::string nameStr(cStr);
const std::string nameStr(cStr);
mono_free(cStr);

Entity entity = scene->CreateEntity(nameStr);
EPPO_ASSERT(entity);
EPPO_ASSERT(entity)

return entity.GetUUID();
}
Expand All @@ -87,11 +87,11 @@ namespace Eppo
{
EPPO_PROFILE_FUNCTION("ScriptGlue::Entity_FindEntityByName");

Ref<Scene> scene = ScriptEngine::GetSceneContext();
EPPO_ASSERT(scene);
const Ref<Scene> scene = ScriptEngine::GetSceneContext();
EPPO_ASSERT(scene)

char* cStr = mono_string_to_utf8(name);
std::string nameStr(cStr);
const std::string nameStr(cStr);
mono_free(cStr);

Entity entity = scene->FindEntityByName(nameStr);
Expand All @@ -101,86 +101,86 @@ namespace Eppo
return entity.GetUUID();
}

static MonoString* Entity_GetName(UUID uuid)
static MonoString* Entity_GetName(const UUID uuid)
{
EPPO_PROFILE_FUNCTION("ScriptGlue::Entity_GetName");

Ref<Scene> scene = ScriptEngine::GetSceneContext();
EPPO_ASSERT(scene);
const Ref<Scene> scene = ScriptEngine::GetSceneContext();
EPPO_ASSERT(scene)
Entity entity = scene->FindEntityByUUID(uuid);
EPPO_ASSERT(entity);
EPPO_ASSERT(entity)

MonoString* monoStr = mono_string_new(ScriptEngine::GetAppDomain(), entity.GetName().c_str());

return monoStr;
}

static bool Entity_HasComponent(UUID uuid, MonoReflectionType* componentType)
static bool Entity_HasComponent(const UUID uuid, MonoReflectionType* componentType)
{
EPPO_PROFILE_FUNCTION("ScriptGlue::Entity_HasComponent");

Ref<Scene> scene = ScriptEngine::GetSceneContext();
EPPO_ASSERT(scene);
Entity entity = scene->FindEntityByUUID(uuid);
EPPO_ASSERT(entity);
const Ref<Scene> scene = ScriptEngine::GetSceneContext();
EPPO_ASSERT(scene)
const Entity entity = scene->FindEntityByUUID(uuid);
EPPO_ASSERT(entity)

MonoType* managedType = mono_reflection_type_get_type(componentType);
auto it = s_EntityHasComponentFns.find(managedType);
EPPO_ASSERT(it != s_EntityHasComponentFns.end());
const auto it = s_EntityHasComponentFns.find(managedType);
EPPO_ASSERT(it != s_EntityHasComponentFns.end())
return it->second(entity);
}

static void TransformComponent_GetTranslation(UUID uuid, glm::vec3* outTranslation)
static void TransformComponent_GetTranslation(const UUID uuid, glm::vec3* outTranslation)
{
EPPO_PROFILE_FUNCTION("ScriptGlue::TransformComponent_GetTranslation");

Ref<Scene> scene = ScriptEngine::GetSceneContext();
EPPO_ASSERT(scene);
const Ref<Scene> scene = ScriptEngine::GetSceneContext();
EPPO_ASSERT(scene)
Entity entity = scene->FindEntityByUUID(uuid);
EPPO_ASSERT(entity);
EPPO_ASSERT(entity)

*outTranslation = entity.GetComponent<TransformComponent>().Translation;
}

static void TransformComponent_SetTranslation(UUID uuid, glm::vec3* translation)
static void TransformComponent_SetTranslation(const UUID uuid, const glm::vec3* translation)
{
EPPO_PROFILE_FUNCTION("ScriptGlue::TransformComponent_SetTranslation");

Ref<Scene> scene = ScriptEngine::GetSceneContext();
EPPO_ASSERT(scene);
const Ref<Scene> scene = ScriptEngine::GetSceneContext();
EPPO_ASSERT(scene)
Entity entity = scene->FindEntityByUUID(uuid);
EPPO_ASSERT(entity);
EPPO_ASSERT(entity)

entity.GetComponent<TransformComponent>().Translation = *translation;
}

static void RigidBodyComponent_ApplyLinearImpulse(UUID uuid, glm::vec3* impulse, glm::vec3* worldPosition)
static void RigidBodyComponent_ApplyLinearImpulse(const UUID uuid, const glm::vec3* impulse, const glm::vec3* worldPosition)
{
EPPO_PROFILE_FUNCTION("ScriptGlue::RigidBodyComponent_ApplyLinearImpulse");

Ref<Scene> scene = ScriptEngine::GetSceneContext();
EPPO_ASSERT(scene);
const Ref<Scene> scene = ScriptEngine::GetSceneContext();
EPPO_ASSERT(scene)
Entity entity = scene->FindEntityByUUID(uuid);
EPPO_ASSERT(entity);
EPPO_ASSERT(entity)

auto& rb = entity.GetComponent<RigidBodyComponent>();
const auto& rb = entity.GetComponent<RigidBodyComponent>();
rb.RuntimeBody.ApplyLinearImpulse(*impulse, *worldPosition);
}

static void RigidBodyComponent_ApplyLinearImpulseToCenter(UUID uuid, glm::vec3* impulse)
static void RigidBodyComponent_ApplyLinearImpulseToCenter(const UUID uuid, const glm::vec3* impulse)
{
EPPO_PROFILE_FUNCTION("ScriptGlue::RigidBodyComponent_ApplyLinearImpulseToCenter");

Ref<Scene> scene = ScriptEngine::GetSceneContext();
EPPO_ASSERT(scene);
const Ref<Scene> scene = ScriptEngine::GetSceneContext();
EPPO_ASSERT(scene)
Entity entity = scene->FindEntityByUUID(uuid);
EPPO_ASSERT(entity);
EPPO_ASSERT(entity)

auto& rb = entity.GetComponent<RigidBodyComponent>();
const auto& rb = entity.GetComponent<RigidBodyComponent>();
rb.RuntimeBody.ApplyLinearImpulse(*impulse);
}

static MonoObject* GetScriptInstance(UUID uuid)
static MonoObject* GetScriptInstance(const UUID uuid)
{
EPPO_PROFILE_FUNCTION("ScriptGlue::GetScriptInstance");

Expand All @@ -191,18 +191,18 @@ namespace Eppo
{
EPPO_PROFILE_FUNCTION("ScriptGlue::RegisterFunctions");

EPPO_ADD_INTERNAL_CALL(Log);
EPPO_ADD_INTERNAL_CALL(Input_IsKeyPressed);
EPPO_ADD_INTERNAL_CALL(Entity_AddComponent);
EPPO_ADD_INTERNAL_CALL(Entity_CreateNewEntity);
EPPO_ADD_INTERNAL_CALL(Entity_FindEntityByName);
EPPO_ADD_INTERNAL_CALL(Entity_GetName);
EPPO_ADD_INTERNAL_CALL(Entity_HasComponent);
EPPO_ADD_INTERNAL_CALL(TransformComponent_GetTranslation);
EPPO_ADD_INTERNAL_CALL(TransformComponent_SetTranslation);
EPPO_ADD_INTERNAL_CALL(RigidBodyComponent_ApplyLinearImpulse);
EPPO_ADD_INTERNAL_CALL(RigidBodyComponent_ApplyLinearImpulseToCenter);
EPPO_ADD_INTERNAL_CALL(GetScriptInstance);
EPPO_ADD_INTERNAL_CALL(Log)
EPPO_ADD_INTERNAL_CALL(Input_IsKeyPressed)
EPPO_ADD_INTERNAL_CALL(Entity_AddComponent)
EPPO_ADD_INTERNAL_CALL(Entity_CreateNewEntity)
EPPO_ADD_INTERNAL_CALL(Entity_FindEntityByName)
EPPO_ADD_INTERNAL_CALL(Entity_GetName)
EPPO_ADD_INTERNAL_CALL(Entity_HasComponent)
EPPO_ADD_INTERNAL_CALL(TransformComponent_GetTranslation)
EPPO_ADD_INTERNAL_CALL(TransformComponent_SetTranslation)
EPPO_ADD_INTERNAL_CALL(RigidBodyComponent_ApplyLinearImpulse)
EPPO_ADD_INTERNAL_CALL(RigidBodyComponent_ApplyLinearImpulseToCenter)
EPPO_ADD_INTERNAL_CALL(GetScriptInstance)
}

void ScriptGlue::RegisterComponents()
Expand All @@ -224,8 +224,8 @@ namespace Eppo
{
EPPO_PROFILE_FUNCTION("ScriptGlue::RegisterComponent");

std::string_view typeName = typeid(T).name();
size_t pos = typeName.find_last_of(':');
const std::string_view typeName = typeid(T).name();
const size_t pos = typeName.find_last_of(':');
std::string_view structName = typeName.substr(pos + 1);
std::string managedTypeName = fmt::format("Eppo.{}", structName);

Expand Down
16 changes: 8 additions & 8 deletions EppoEngine/Source/Scripting/ScriptInstance.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Eppo
{
ScriptInstance::ScriptInstance(Ref<ScriptClass> scriptClass, Entity entity)
ScriptInstance::ScriptInstance(const Ref<ScriptClass>& scriptClass, Entity entity)
: m_ScriptClass(scriptClass)
{
EPPO_PROFILE_FUNCTION("ScriptInstance::ScriptInstance");
Expand All @@ -23,15 +23,15 @@ namespace Eppo
m_ScriptClass->InvokeMethod(m_Instance, m_Constructor, &param);
}

void ScriptInstance::InvokeOnCreate()
void ScriptInstance::InvokeOnCreate() const
{
EPPO_PROFILE_FUNCTION("ScriptInstance::InvokeOnCreate");

if (m_OnCreate)
m_ScriptClass->InvokeMethod(m_Instance, m_OnCreate);
}

void ScriptInstance::InvokeOnUpdate(float timestep)
void ScriptInstance::InvokeOnUpdate(float timestep) const
{
EPPO_PROFILE_FUNCTION("ScriptInstance::InvokeOnUpdate");

Expand All @@ -42,12 +42,12 @@ namespace Eppo
}
}

bool ScriptInstance::GetFieldValueInternal(const std::string& name, void* buffer)
bool ScriptInstance::GetFieldValueInternal(const std::string& name, void* buffer) const
{
EPPO_PROFILE_FUNCTION("ScriptInstance::GetFieldValueInternal");

const auto& fields = m_ScriptClass->GetFields();
auto it = fields.find(name);
const auto it = fields.find(name);
if (it == fields.end())
return false;

Expand All @@ -57,17 +57,17 @@ namespace Eppo
return true;
}

bool ScriptInstance::SetFieldValueInternal(const std::string& name, const void* value)
bool ScriptInstance::SetFieldValueInternal(const std::string& name, const void* value) const
{
EPPO_PROFILE_FUNCTION("ScriptInstance::SetFieldValueInternal");

const auto& fields = m_ScriptClass->GetFields();
auto it = fields.find(name);
const auto it = fields.find(name);
if (it == fields.end())
return false;

const ScriptField& field = it->second;
mono_field_set_value(m_Instance, field.ClassField, (void*)value);
mono_field_set_value(m_Instance, field.ClassField, const_cast<void*>(value));

return true;
}
Expand Down
12 changes: 6 additions & 6 deletions EppoEngine/Source/Scripting/ScriptInstance.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ namespace Eppo
class ScriptInstance
{
public:
ScriptInstance(Ref<ScriptClass> scriptClass, Entity entity);
ScriptInstance(const Ref<ScriptClass>& scriptClass, Entity entity);

void InvokeOnCreate();
void InvokeOnUpdate(float timestep);
void InvokeOnCreate() const;
void InvokeOnUpdate(float timestep) const;

Ref<ScriptClass> GetScriptClass() { return m_ScriptClass; }
MonoObject* GetManagedObject() { return m_Instance; }
[[nodiscard]] MonoObject* GetManagedObject() const { return m_Instance; }

template<typename T>
T GetFieldValue(const std::string& name)
Expand All @@ -38,8 +38,8 @@ namespace Eppo
}

private:
bool GetFieldValueInternal(const std::string& name, void* buffer);
bool SetFieldValueInternal(const std::string& name, const void* value);
bool GetFieldValueInternal(const std::string& name, void* buffer) const;
bool SetFieldValueInternal(const std::string& name, const void* value) const;

private:
Ref<ScriptClass> m_ScriptClass;
Expand Down
Loading

0 comments on commit 2de9571

Please sign in to comment.