Skip to content

Commit

Permalink
remove using namespace declarations from headers
Browse files Browse the repository at this point in the history
  • Loading branch information
@konstatoivanen
konstatoivanen committed Jan 30, 2022
1 parent eee65af commit 2611354
Show file tree
Hide file tree
Showing 128 changed files with 1,012 additions and 1,053 deletions.
6 changes: 4 additions & 2 deletions PKRenderer/src/Core/Application.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ namespace PK::Core
{
using namespace Utilities;
using namespace Rendering;
using namespace Rendering::Structs;
using namespace Rendering::Objects;
using namespace Services;

Application* Application::s_Instance = nullptr;
Expand Down Expand Up @@ -139,7 +141,7 @@ namespace PK::Core

Application::~Application()
{
GetService<ECS::Sequencer>()->Release();
GetService<Services::Sequencer>()->Release();
GetService<AssetDatabase>()->Unload();
m_services->Clear();
m_window = nullptr;
Expand All @@ -148,7 +150,7 @@ namespace PK::Core

void Application::Run()
{
auto sequencer = GetService<ECS::Sequencer>();
auto sequencer = GetService<Services::Sequencer>();

while (m_window->IsAlive() && m_Running)
{
Expand Down
12 changes: 4 additions & 8 deletions PKRenderer/src/Core/Application.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,13 @@ int main(int argc, char** argv);

namespace PK::Core
{
using namespace Utilities;
using namespace Rendering;
using namespace Services;

struct ApplicationArguments
{
int count;
char** args;
};

class Application : public NoCopy
class Application : public Utilities::NoCopy
{
public:
Application(ApplicationArguments arguments, const std::string& name = "Application");
Expand All @@ -40,9 +36,9 @@ namespace PK::Core
static Application* s_Instance;
bool m_Running = true;

Scope<GraphicsDriver> m_graphicsDriver;
Scope<Window> m_window;
Scope<ServiceRegister> m_services;
Utilities::Scope<Rendering::GraphicsDriver> m_graphicsDriver;
Utilities::Scope<Window> m_window;
Utilities::Scope<Services::ServiceRegister> m_services;

friend int ::main(int argc, char** argv);
};
Expand Down
2 changes: 1 addition & 1 deletion PKRenderer/src/Core/ApplicationConfig.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,5 @@ namespace PK::Core
bool AssetImporters::IsValidExtension<ApplicationConfig>(const std::filesystem::path& extension) { return extension.compare(".cfg") == 0; }

template<>
Ref<ApplicationConfig> AssetImporters::Create() { return CreateRef<ApplicationConfig>(); }
Utilities::Ref<ApplicationConfig> AssetImporters::Create() { return Utilities::CreateRef<ApplicationConfig>(); }
}
145 changes: 71 additions & 74 deletions PKRenderer/src/Core/ApplicationConfig.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,89 +4,86 @@

namespace PK::Core
{
using namespace Services;
using namespace YAML;

struct ApplicationConfig : YamlValueList, public Asset, public IAssetImportSimple
struct ApplicationConfig : YAML::YamlValueList, public Core::Services::Asset, public Core::Services::IAssetImportSimple
{
BoxedValue<bool> EnableConsole = BoxedValue<bool>("EnableConsole", true);
BoxedValue<bool> EnableVsync = BoxedValue<bool>("EnableVsync", true);
BoxedValue<bool> EnableGizmos = BoxedValue<bool>("EnableGizmos", false);
BoxedValue<bool> EnableLightingDebug = BoxedValue<bool>("EnableLightingDebug", false);
BoxedValue<bool> EnableCursor = BoxedValue<bool>("EnableCursor", true);
BoxedValue<bool> EnableFrameRateLog = BoxedValue<bool>("EnableFrameRateLog", true);
BoxedValue<int> InitialWidth = BoxedValue<int>("InitialWidth", 1024);
BoxedValue<int> InitialHeight = BoxedValue<int>("InitialHeight", 512);
YAML::BoxedValue<bool> EnableConsole = YAML::BoxedValue<bool>("EnableConsole", true);
YAML::BoxedValue<bool> EnableVsync = YAML::BoxedValue<bool>("EnableVsync", true);
YAML::BoxedValue<bool> EnableGizmos = YAML::BoxedValue<bool>("EnableGizmos", false);
YAML::BoxedValue<bool> EnableLightingDebug = YAML::BoxedValue<bool>("EnableLightingDebug", false);
YAML::BoxedValue<bool> EnableCursor = YAML::BoxedValue<bool>("EnableCursor", true);
YAML::BoxedValue<bool> EnableFrameRateLog = YAML::BoxedValue<bool>("EnableFrameRateLog", true);
YAML::BoxedValue<int> InitialWidth = YAML::BoxedValue<int>("InitialWidth", 1024);
YAML::BoxedValue<int> InitialHeight = YAML::BoxedValue<int>("InitialHeight", 512);

BoxedValue<uint> RandomSeed = BoxedValue<uint>("RandomSeed", 512);
YAML::BoxedValue<Math::uint> RandomSeed = YAML::BoxedValue<Math::uint>("RandomSeed", 512);

BoxedValue<float3> CameraStartPosition = BoxedValue<float3>("CameraStartPosition", PK_FLOAT3_ZERO);
BoxedValue<float3> CameraStartRotation = BoxedValue<float3>("CameraStartRotation", PK_FLOAT3_ZERO);
BoxedValue<float> CameraSpeed = BoxedValue<float>("CameraSpeed", 5.0f);
BoxedValue<float> CameraLookSensitivity = BoxedValue<float>("CameraLookSensitivity", 1.0f);
BoxedValue<float> CameraMoveSmoothing = BoxedValue<float>("CameraMoveSmoothing", 0.0f);
BoxedValue<float> CameraLookSmoothing = BoxedValue<float>("CameraLookSmoothing", 0.0f);
BoxedValue<float> CameraFov = BoxedValue<float>("CameraFov", 75.0f);
BoxedValue<float> CameraZNear = BoxedValue<float>("CameraZNear", 0.1f);
BoxedValue<float> CameraZFar = BoxedValue<float>("CameraZFar", 200.0f);
BoxedValue<float> CascadeLinearity = BoxedValue<float>("CascadeLinearity", 0.5f);
YAML::BoxedValue<Math::float3> CameraStartPosition = YAML::BoxedValue<Math::float3>("CameraStartPosition", Math::PK_FLOAT3_ZERO);
YAML::BoxedValue<Math::float3> CameraStartRotation = YAML::BoxedValue<Math::float3>("CameraStartRotation", Math::PK_FLOAT3_ZERO);
YAML::BoxedValue<float> CameraSpeed = YAML::BoxedValue<float>("CameraSpeed", 5.0f);
YAML::BoxedValue<float> CameraLookSensitivity = YAML::BoxedValue<float>("CameraLookSensitivity", 1.0f);
YAML::BoxedValue<float> CameraMoveSmoothing = YAML::BoxedValue<float>("CameraMoveSmoothing", 0.0f);
YAML::BoxedValue<float> CameraLookSmoothing = YAML::BoxedValue<float>("CameraLookSmoothing", 0.0f);
YAML::BoxedValue<float> CameraFov = YAML::BoxedValue<float>("CameraFov", 75.0f);
YAML::BoxedValue<float> CameraZNear = YAML::BoxedValue<float>("CameraZNear", 0.1f);
YAML::BoxedValue<float> CameraZFar = YAML::BoxedValue<float>("CameraZFar", 200.0f);
YAML::BoxedValue<float> CascadeLinearity = YAML::BoxedValue<float>("CascadeLinearity", 0.5f);

BoxedValue<float> TimeScale = BoxedValue<float>("TimeScale", 1.0f);
YAML::BoxedValue<float> TimeScale = YAML::BoxedValue<float>("TimeScale", 1.0f);

BoxedValue<uint> LightCount = BoxedValue<uint>("LightCount", 0u);
BoxedValue<uint> ShadowmapTileSize = BoxedValue<uint>("ShadowmapTileSize", 512);
BoxedValue<uint> ShadowmapTileCount = BoxedValue<uint>("ShadowmapTileCount", 32);
YAML::BoxedValue<Math::uint> LightCount = YAML::BoxedValue<Math::uint>("LightCount", 0u);
YAML::BoxedValue<Math::uint> ShadowmapTileSize = YAML::BoxedValue<Math::uint>("ShadowmapTileSize", 512);
YAML::BoxedValue<Math::uint> ShadowmapTileCount = YAML::BoxedValue<Math::uint>("ShadowmapTileCount", 32);

BoxedValue<float> CameraFocalLength = BoxedValue<float>("CameraFocalLength", 0.05f);
BoxedValue<float> CameraFNumber = BoxedValue<float>("CameraFNumber", 1.40f);
BoxedValue<float> CameraFilmHeight = BoxedValue<float>("CameraFilmHeight", 0.024f);
BoxedValue<float> CameraFocusSpeed = BoxedValue<float>("CameraFocusSpeed", 5.0f);
BoxedValue<float> AutoExposureLuminanceMin = BoxedValue<float>("AutoExposureLuminanceMin", 1.0f);
BoxedValue<float> AutoExposureLuminanceRange = BoxedValue<float>("AutoExposureLuminanceRange", 1.0f);
BoxedValue<float> AutoExposureSpeed = BoxedValue<float>("AutoExposureSpeed", 1.0f);
BoxedValue<float> TonemapExposure = BoxedValue<float>("TonemapExposure", 1.0f);
BoxedValue<float> VignetteIntensity = BoxedValue<float>("VignetteIntensity", 15.0f);
BoxedValue<float> VignettePower = BoxedValue<float>("VignettePower", 0.25f);
BoxedValue<float> FilmGrainIntensity = BoxedValue<float>("FilmGrainIntensity", 0.25f);
BoxedValue<float> FilmGrainLuminance = BoxedValue<float>("FilmGrainLuminance", 0.25f);
BoxedValue<float> CC_Contribution = BoxedValue<float>("CC_Contribution", 1.0f);
BoxedValue<float> CC_TemperatureShift = BoxedValue<float>("CC_TemperatureShift", 0.0f);
BoxedValue<float> CC_Tint = BoxedValue<float>("CC_Tint", 0.0f);
BoxedValue<float> CC_Hue = BoxedValue<float>("CC_Hue", 0.0f);
BoxedValue<float> CC_Saturation = BoxedValue<float>("CC_Saturation", 1.0f);
BoxedValue<float> CC_Vibrance = BoxedValue<float>("CC_Vibrance", 0.0f);
BoxedValue<float> CC_Value = BoxedValue<float>("CC_Value", 1.0f);
BoxedValue<float> CC_Contrast = BoxedValue<float>("CC_Contrast", 1.0f);
BoxedValue<float> CC_Gain = BoxedValue<float>("CC_Gain", 1.0f);
BoxedValue<float> CC_Gamma = BoxedValue<float>("CC_Gamma", 1.0f);
BoxedValue<uint> CC_Shadows = BoxedValue<uint>("CC_Shadows", 0x000000FF);
BoxedValue<uint> CC_Midtones = BoxedValue<uint>("CC_Midtones", 0x7F7F7FFF);
BoxedValue<uint> CC_Highlights = BoxedValue<uint>("CC_Highlights", 0xFFFFFFFF);
BoxedValue<uint> CC_ChannelMixerRed = BoxedValue<uint>("CC_ChannelMixerRed", 0xFF0000FF);
BoxedValue<uint> CC_ChannelMixerGreen = BoxedValue<uint>("CC_ChannelMixerGreen", 0x00FF00FF);
BoxedValue<uint> CC_ChannelMixerBlue = BoxedValue<uint>("CC_ChannelMixerBlue", 0x0000FFFF);
BoxedValue<float> BloomIntensity = BoxedValue<float>("BloomIntensity", 0.0f);
BoxedValue<float> BloomLensDirtIntensity = BoxedValue<float>("BloomLensDirtIntensity", 0.0f);
BoxedValue<std::string> FileBloomDirt = BoxedValue<std::string>("FileBloomDirt", "T_Bloom_LensDirt");
YAML::BoxedValue<float> CameraFocalLength = YAML::BoxedValue<float>("CameraFocalLength", 0.05f);
YAML::BoxedValue<float> CameraFNumber = YAML::BoxedValue<float>("CameraFNumber", 1.40f);
YAML::BoxedValue<float> CameraFilmHeight = YAML::BoxedValue<float>("CameraFilmHeight", 0.024f);
YAML::BoxedValue<float> CameraFocusSpeed = YAML::BoxedValue<float>("CameraFocusSpeed", 5.0f);
YAML::BoxedValue<float> AutoExposureLuminanceMin = YAML::BoxedValue<float>("AutoExposureLuminanceMin", 1.0f);
YAML::BoxedValue<float> AutoExposureLuminanceRange = YAML::BoxedValue<float>("AutoExposureLuminanceRange", 1.0f);
YAML::BoxedValue<float> AutoExposureSpeed = YAML::BoxedValue<float>("AutoExposureSpeed", 1.0f);
YAML::BoxedValue<float> TonemapExposure = YAML::BoxedValue<float>("TonemapExposure", 1.0f);
YAML::BoxedValue<float> VignetteIntensity = YAML::BoxedValue<float>("VignetteIntensity", 15.0f);
YAML::BoxedValue<float> VignettePower = YAML::BoxedValue<float>("VignettePower", 0.25f);
YAML::BoxedValue<float> FilmGrainIntensity = YAML::BoxedValue<float>("FilmGrainIntensity", 0.25f);
YAML::BoxedValue<float> FilmGrainLuminance = YAML::BoxedValue<float>("FilmGrainLuminance", 0.25f);
YAML::BoxedValue<float> CC_Contribution = YAML::BoxedValue<float>("CC_Contribution", 1.0f);
YAML::BoxedValue<float> CC_TemperatureShift = YAML::BoxedValue<float>("CC_TemperatureShift", 0.0f);
YAML::BoxedValue<float> CC_Tint = YAML::BoxedValue<float>("CC_Tint", 0.0f);
YAML::BoxedValue<float> CC_Hue = YAML::BoxedValue<float>("CC_Hue", 0.0f);
YAML::BoxedValue<float> CC_Saturation = YAML::BoxedValue<float>("CC_Saturation", 1.0f);
YAML::BoxedValue<float> CC_Vibrance = YAML::BoxedValue<float>("CC_Vibrance", 0.0f);
YAML::BoxedValue<float> CC_Value = YAML::BoxedValue<float>("CC_Value", 1.0f);
YAML::BoxedValue<float> CC_Contrast = YAML::BoxedValue<float>("CC_Contrast", 1.0f);
YAML::BoxedValue<float> CC_Gain = YAML::BoxedValue<float>("CC_Gain", 1.0f);
YAML::BoxedValue<float> CC_Gamma = YAML::BoxedValue<float>("CC_Gamma", 1.0f);
YAML::BoxedValue<Math::uint> CC_Shadows = YAML::BoxedValue<Math::uint>("CC_Shadows", 0x000000FF);
YAML::BoxedValue<Math::uint> CC_Midtones = YAML::BoxedValue<Math::uint>("CC_Midtones", 0x7F7F7FFF);
YAML::BoxedValue<Math::uint> CC_Highlights = YAML::BoxedValue<Math::uint>("CC_Highlights", 0xFFFFFFFF);
YAML::BoxedValue<Math::uint> CC_ChannelMixerRed = YAML::BoxedValue<Math::uint>("CC_ChannelMixerRed", 0xFF0000FF);
YAML::BoxedValue<Math::uint> CC_ChannelMixerGreen = YAML::BoxedValue<Math::uint>("CC_ChannelMixerGreen", 0x00FF00FF);
YAML::BoxedValue<Math::uint> CC_ChannelMixerBlue = YAML::BoxedValue<Math::uint>("CC_ChannelMixerBlue", 0x0000FFFF);
YAML::BoxedValue<float> BloomIntensity = YAML::BoxedValue<float>("BloomIntensity", 0.0f);
YAML::BoxedValue<float> BloomLensDirtIntensity = YAML::BoxedValue<float>("BloomLensDirtIntensity", 0.0f);
YAML::BoxedValue<std::string> FileBloomDirt = YAML::BoxedValue<std::string>("FileBloomDirt", "T_Bloom_LensDirt");

BoxedValue<float> AmbientOcclusionIntensity = BoxedValue<float>("AmbientOcclusionIntensity", 1.0f);
BoxedValue<float> AmbientOcclusionRadius = BoxedValue<float>("AmbientOcclusionRadius", 1.0f);
BoxedValue<bool> AmbientOcclusionDownsample = BoxedValue<bool>("AmbientOcclusionDownsample", true);
YAML::BoxedValue<float> AmbientOcclusionIntensity = YAML::BoxedValue<float>("AmbientOcclusionIntensity", 1.0f);
YAML::BoxedValue<float> AmbientOcclusionRadius = YAML::BoxedValue<float>("AmbientOcclusionRadius", 1.0f);
YAML::BoxedValue<bool> AmbientOcclusionDownsample = YAML::BoxedValue<bool>("AmbientOcclusionDownsample", true);

BoxedValue<float> VolumeConstantFog = BoxedValue<float>("VolumeConstantFog", 0.0f);
BoxedValue<float> VolumeHeightFogExponent = BoxedValue<float>("VolumeHeightFogExponent", 0.0f);
BoxedValue<float> VolumeHeightFogOffset = BoxedValue<float>("VolumeHeightFogOffset", 0.0f);
BoxedValue<float> VolumeHeightFogAmount = BoxedValue<float>("VolumeHeightFogAmount", 0.0f);
BoxedValue<float> VolumeDensity = BoxedValue<float>("VolumeDensity", 0.0f);
BoxedValue<float> VolumeIntensity = BoxedValue<float>("VolumeIntensity", 0.0f);
BoxedValue<float> VolumeAnisotropy = BoxedValue<float>("VolumeAnisotropy", 0.0f);
BoxedValue<float> VolumeNoiseFogAmount = BoxedValue<float>("VolumeNoiseFogAmount", 0.0f);
BoxedValue<float> VolumeNoiseFogScale = BoxedValue<float>("VolumeNoiseFogScale", 0.0f);
BoxedValue<float> VolumeWindSpeed = BoxedValue<float>("VolumeWindSpeed", 0.0f);
BoxedValue<float3> VolumeWindDirection = BoxedValue<float3>("VolumeWindDirection", PK_FLOAT3_FORWARD);
YAML::BoxedValue<float> VolumeConstantFog = YAML::BoxedValue<float>("VolumeConstantFog", 0.0f);
YAML::BoxedValue<float> VolumeHeightFogExponent = YAML::BoxedValue<float>("VolumeHeightFogExponent", 0.0f);
YAML::BoxedValue<float> VolumeHeightFogOffset = YAML::BoxedValue<float>("VolumeHeightFogOffset", 0.0f);
YAML::BoxedValue<float> VolumeHeightFogAmount = YAML::BoxedValue<float>("VolumeHeightFogAmount", 0.0f);
YAML::BoxedValue<float> VolumeDensity = YAML::BoxedValue<float>("VolumeDensity", 0.0f);
YAML::BoxedValue<float> VolumeIntensity = YAML::BoxedValue<float>("VolumeIntensity", 0.0f);
YAML::BoxedValue<float> VolumeAnisotropy = YAML::BoxedValue<float>("VolumeAnisotropy", 0.0f);
YAML::BoxedValue<float> VolumeNoiseFogAmount = YAML::BoxedValue<float>("VolumeNoiseFogAmount", 0.0f);
YAML::BoxedValue<float> VolumeNoiseFogScale = YAML::BoxedValue<float>("VolumeNoiseFogScale", 0.0f);
YAML::BoxedValue<float> VolumeWindSpeed = YAML::BoxedValue<float>("VolumeWindSpeed", 0.0f);
YAML::BoxedValue<Math::float3> VolumeWindDirection = YAML::BoxedValue<Math::float3>("VolumeWindDirection", Math::PK_FLOAT3_FORWARD);

BoxedValue<std::string> FileBackgroundTexture = BoxedValue<std::string>("FileBackgroundTexture", "T_OEM_Mountains");
BoxedValue<float> BackgroundExposure = BoxedValue<float>("BackgroundExposure", 1.0f);
YAML::BoxedValue<std::string> FileBackgroundTexture = YAML::BoxedValue<std::string>("FileBackgroundTexture", "T_OEM_Mountains");
YAML::BoxedValue<float> BackgroundExposure = YAML::BoxedValue<float>("BackgroundExposure", 1.0f);

ApplicationConfig();

Expand Down
4 changes: 2 additions & 2 deletions PKRenderer/src/Core/CommandConfig.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ namespace PK::Core
}

template<>
bool AssetImporters::IsValidExtension<CommandConfig>(const std::filesystem::path& extension) { return extension.compare(".keycfg") == 0; }
bool Services::AssetImporters::IsValidExtension<CommandConfig>(const std::filesystem::path& extension) { return extension.compare(".keycfg") == 0; }

template<>
Ref<CommandConfig> AssetImporters::Create() { return CreateRef<CommandConfig>(); }
Utilities::Ref<CommandConfig> Services::AssetImporters::Create() { return Utilities::CreateRef<CommandConfig>(); }
}
6 changes: 2 additions & 4 deletions PKRenderer/src/Core/CommandConfig.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@

namespace PK::Core
{
using namespace YAML;

struct CommandConfig : YamlValueList, public Asset, public IAssetImportSimple
struct CommandConfig : YAML::YamlValueList, public Core::Services::Asset, public Core::Services::IAssetImportSimple
{
BoxedValue<ConsoleCommandBindList> Commands = BoxedValue<ConsoleCommandBindList>("Commands", ConsoleCommandBindList());
YAML::BoxedValue<ConsoleCommandBindList> Commands = YAML::BoxedValue<ConsoleCommandBindList>("Commands", ConsoleCommandBindList());
CommandConfig();
void Import(const char* filepath, void* pParams) override final;
};
Expand Down
4 changes: 1 addition & 3 deletions PKRenderer/src/Core/ConsoleCommandBinding.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

namespace PK::Core
{
using namespace Services;

struct ConsoleCommandToken
{
const std::string& argument;
Expand All @@ -14,7 +12,7 @@ namespace PK::Core

struct ConsoleCommandBinding
{
KeyCode keycode = KeyCode::MOUSE1;
Services::KeyCode keycode = Services::KeyCode::MOUSE1;
std::string command;
};

Expand Down
16 changes: 7 additions & 9 deletions PKRenderer/src/Core/Services/AssetDatabase.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@

namespace PK::Core::Services
{
using namespace PK::Utilities;

typedef uint32_t AssetID;

class Asset : public NoCopy
class Asset : public Utilities::NoCopy
{
friend class AssetDatabase;

Expand All @@ -32,7 +30,7 @@ namespace PK::Core::Services

// @TODO decouple these from the actual asset classes
template<typename TParams>
class IAssetImport : public NoCopy
class IAssetImport : public Utilities::NoCopy
{
friend class AssetDatabase;
virtual void Import(const char* filepath, TParams* pParams) = 0;
Expand All @@ -59,7 +57,7 @@ namespace PK::Core::Services
bool IsValidExtension(const std::filesystem::path& extension);

template<typename T>
[[nodiscard]] Ref<T> Create();
[[nodiscard]] Utilities::Ref<T> Create();
};

class AssetDatabase : public IService
Expand Down Expand Up @@ -101,7 +99,7 @@ namespace PK::Core::Services

auto& collection = m_assets[std::type_index(typeid(T))];
auto iter = collection.find(assetId);
Ref<T> asset = nullptr;
Utilities::Ref<T> asset = nullptr;

if (iter != collection.end())
{
Expand Down Expand Up @@ -134,15 +132,15 @@ namespace PK::Core::Services

PK_THROW_ASSERT(collection.count(assetId) < 1, "Procedural asset (%s) already exists", name.c_str());

auto asset = CreateRef<T>(std::forward<Args>(args)...);
auto asset = Utilities::CreateRef<T>(std::forward<Args>(args)...);
collection[assetId] = asset;
std::static_pointer_cast<Asset>(asset)->m_assetId = assetId;

return asset.get();
}

template<typename T, typename ... Args>
[[nodiscard]] T* RegisterProcedural(std::string name, Ref<T> asset)
[[nodiscard]] T* RegisterProcedural(std::string name, Utilities::Ref<T> asset)
{
static_assert(std::is_base_of<Asset, T>::value, "Template argument type does not derive from Asset!");

Expand Down Expand Up @@ -326,7 +324,7 @@ namespace PK::Core::Services
}

private:
std::unordered_map<std::type_index, std::unordered_map<AssetID, Ref<Asset>>> m_assets;
std::unordered_map<std::type_index, std::unordered_map<AssetID, Utilities::Ref<Asset>>> m_assets;
Sequencer* m_sequencer;
};
}
4 changes: 2 additions & 2 deletions PKRenderer/src/Core/Services/Input.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace PK::Core::Services
return action == GLFW_PRESS || action == GLFW_REPEAT;
}

float2 Input::GetAxis2D(KeyCode front, KeyCode back, KeyCode right, KeyCode left)
Math::float2 Input::GetAxis2D(KeyCode front, KeyCode back, KeyCode right, KeyCode left)
{
return
{
Expand All @@ -57,7 +57,7 @@ namespace PK::Core::Services
};
}

float3 Input::GetAxis3D(KeyCode up, KeyCode down, KeyCode front, KeyCode back, KeyCode right, KeyCode left)
Math::float3 Input::GetAxis3D(KeyCode up, KeyCode down, KeyCode front, KeyCode back, KeyCode right, KeyCode left)
{
return
{
Expand Down
Loading

0 comments on commit 2611354

Please sign in to comment.