Removing named namespace from code base.
This commit is contained in:
+3
-4
@@ -1,4 +1,4 @@
|
||||
#include "main.h"
|
||||
#include "main.h"
|
||||
|
||||
#ifdef global
|
||||
#undef global
|
||||
@@ -53,7 +53,7 @@ static bool animateCamera = true;
|
||||
static bool freeCameraMode = false;
|
||||
static float camYaw = 0.0f;
|
||||
static float camPitch = 0.0f;
|
||||
static Juliet::Vector3 camPos = { 25.0f, 0.0f, 12.5f };
|
||||
static Vector3 camPos = { 25.0f, 0.0f, 12.5f };
|
||||
|
||||
static float animateCubesTime = 0.0f;
|
||||
static float animateLightsTime = 0.0f;
|
||||
@@ -84,7 +84,6 @@ static float blueLightColor[3] = { 0.2f, 0.2f, 1.0f };
|
||||
// TODO : Remove main.h. Useless
|
||||
// May be remove that Application class, useless too.
|
||||
|
||||
using namespace Juliet;
|
||||
|
||||
namespace
|
||||
{
|
||||
@@ -505,7 +504,7 @@ void JulietApplication::Update(float deltaTime)
|
||||
|
||||
// Memory debugger toggle
|
||||
static bool toggleDebounce = false;
|
||||
if (IsKeyDown(Juliet::ScanCode::Home))
|
||||
if (IsKeyDown(ScanCode::Home))
|
||||
{
|
||||
if (!toggleDebounce)
|
||||
{
|
||||
|
||||
+18
-21
@@ -1,4 +1,4 @@
|
||||
#pragma once
|
||||
#pragma once
|
||||
|
||||
#include <Core/Application/IApplication.h>
|
||||
#include <Core/HAL/Display/Display.h>
|
||||
@@ -6,32 +6,29 @@
|
||||
#include <Core/HotReload/HotReload.h>
|
||||
#include <Graphics/GraphicsPipeline.h>
|
||||
|
||||
namespace Juliet
|
||||
{
|
||||
struct Mesh;
|
||||
struct GraphicsTransferBuffer;
|
||||
struct GraphicsBuffer;
|
||||
struct GraphicsDevice;
|
||||
struct Window;
|
||||
} // namespace Juliet
|
||||
struct Mesh;
|
||||
struct GraphicsTransferBuffer;
|
||||
struct GraphicsBuffer;
|
||||
struct GraphicsDevice;
|
||||
struct Window;
|
||||
|
||||
class JulietApplication : public Juliet::IApplication
|
||||
class JulietApplication : public IApplication
|
||||
{
|
||||
protected:
|
||||
void Init(Juliet::NonNullPtr<Juliet::Arena> arena) override;
|
||||
void Init(NonNullPtr<Arena> arena) override;
|
||||
void Shutdown() override;
|
||||
void Update(float deltaTime) override;
|
||||
bool IsRunning() override;
|
||||
|
||||
Juliet::Window* GetPlatformWindow() override { return MainWindow; }
|
||||
Juliet::GraphicsDevice* GetGraphicsDevice() override { return GraphicsDevice; }
|
||||
Window* GetPlatformWindow() override { return MainWindow; }
|
||||
GraphicsDevice* GetGraphicsDevice() override { return GraphicsDevice; }
|
||||
|
||||
// Render Lifecycle
|
||||
Juliet::ColorTargetInfo GetColorTargetInfo(Juliet::Texture* swapchainTexture) override;
|
||||
Juliet::DepthStencilTargetInfo* GetDepthTargetInfo() override;
|
||||
ColorTargetInfo GetColorTargetInfo(Texture* swapchainTexture) override;
|
||||
DepthStencilTargetInfo* GetDepthTargetInfo() override;
|
||||
|
||||
#if 0
|
||||
Juliet::Camera GetDebugCamera() override;
|
||||
Camera GetDebugCamera() override;
|
||||
#endif
|
||||
|
||||
public:
|
||||
@@ -39,11 +36,11 @@ class JulietApplication : public Juliet::IApplication
|
||||
int GetAutoCloseFrameCount() const { return AutoCloseFrameCount; }
|
||||
|
||||
private:
|
||||
Juliet::Window* MainWindow = {};
|
||||
Juliet::GraphicsDevice* GraphicsDevice = {};
|
||||
Juliet::HotReloadCode GameCode = {};
|
||||
Juliet::GraphicsPipeline* GraphicsPipeline = {};
|
||||
Juliet::Texture* DepthBuffer = {};
|
||||
Window* MainWindow = {};
|
||||
GraphicsDevice* GraphicsDevice = {};
|
||||
HotReloadCode GameCode = {};
|
||||
GraphicsPipeline* GraphicsPipeline = {};
|
||||
Texture* DepthBuffer = {};
|
||||
|
||||
int AutoCloseFrameCount = -1;
|
||||
bool Running = false;
|
||||
|
||||
Reference in New Issue
Block a user