Skip to content

Organization (fix the conflict) #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sheazywi wants to merge 1 commit into from
Closed

Organization (fix the conflict) #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion StarStudio/src/Platform/Windows/WindowsInput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "sspch.h"
#include "WindowsInput.h"

#include "StarStudio/Application.h"
#include "StarStudio/Core/Application.h"
#include <GLFW/glfw3.h>

namespace StarStudio {
Expand Down
2 changes: 1 addition & 1 deletion StarStudio/src/Platform/Windows/WindowsInput.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "StarStudio/Input.h"
#include "StarStudio/Core/Input.h"

namespace StarStudio {

Expand Down
2 changes: 1 addition & 1 deletion StarStudio/src/Platform/Windows/WindowsWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "StarStudio/Window.h"
#include "StarStudio/Core/Window.h"
#include "StarStudio/Renderer/GraphicsContext.h"

#include <GLFW/glfw3.h>
Expand Down
14 changes: 7 additions & 7 deletions StarStudio/src/StarStudio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#pragma once

// for use by StarStudio applications
#include "StarStudio/Application.h"
#include "StarStudio/Layer.h"
#include "StarStudio/Log.h"
#include "StarStudio/Core/Application.h"
#include "StarStudio/Core/Layer.h"
#include "StarStudio/Core/Log.h"

#include "StarStudio/Core/Timestep.h"

// ---Input-------------------------
#include "StarStudio/Input.h"
#include "StarStudio/KeyCodes.h"
#include "StarStudio/MouseButtonCodes.h"
#include "StarStudio/Core/Input.h"
#include "StarStudio/Core/KeyCodes.h"
#include "StarStudio/Core/MouseButtonCodes.h"
// ---------------------------------

#include "StarStudio/ImGui/ImGuiLayer.h"
Expand All @@ -28,5 +28,5 @@
// -----------------------------------

// ---Entry Point---------------------
#include "StarStudio/EntryPoint.h"
#include "StarStudio/Core/EntryPoint.h"
// -----------------------------------
2 changes: 1 addition & 1 deletion StarStudio/src/StarStudio/Application.cpp → ...tudio/src/StarStudio/Core/Application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "sspch.h"
#include "Application.h"

#include "StarStudio/Log.h"
#include "StarStudio/Core/Log.h"

#include "Input.h"
#include "StarStudio/Renderer/Renderer.h"
Expand Down
2 changes: 1 addition & 1 deletion StarStudio/src/StarStudio/Application.h → StarStudio/src/StarStudio/Core/Application.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "Core.h"

#include "Window.h"
#include "StarStudio/LayerStack.h"
#include "StarStudio/Core/LayerStack.h"
#include "StarStudio/Events/Event.h"
#include "StarStudio/Events/ApplicationEvent.h"

Expand Down
0 StarStudio/src/StarStudio/Core.h → StarStudio/src/StarStudio/Core/Core.h
View file
Open in desktop
File renamed without changes.
0 StarStudio/src/StarStudio/EntryPoint.h → StarStudio/src/StarStudio/Core/EntryPoint.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion StarStudio/src/StarStudio/Input.h → StarStudio/src/StarStudio/Core/Input.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "StarStudio/Core.h"
#include "StarStudio/Core/Core.h"

namespace StarStudio {

Expand Down
0 StarStudio/src/StarStudio/KeyCodes.h → StarStudio/src/StarStudio/Core/KeyCodes.h
View file
Open in desktop
File renamed without changes.
0 StarStudio/src/StarStudio/Layer.cpp → StarStudio/src/StarStudio/Core/Layer.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion StarStudio/src/StarStudio/Layer.h → StarStudio/src/StarStudio/Core/Layer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "StarStudio/Core.h"
#include "StarStudio/Core/Core.h"
#include "StarStudio/Core/Timestep.h"
#include "StarStudio/Events/Event.h"

Expand Down
0 StarStudio/src/StarStudio/LayerStack.cpp → ...Studio/src/StarStudio/Core/LayerStack.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion StarStudio/src/StarStudio/LayerStack.h → StarStudio/src/StarStudio/Core/LayerStack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "StarStudio/Core.h"
#include "StarStudio/Core/Core.h"
#include "Layer.h"

#include <vector>
Expand Down
0 StarStudio/src/StarStudio/Log.cpp → StarStudio/src/StarStudio/Core/Log.cpp
View file
Open in desktop
File renamed without changes.
0 StarStudio/src/StarStudio/Log.h → StarStudio/src/StarStudio/Core/Log.h
View file
Open in desktop
File renamed without changes.
0 StarStudio/src/StarStudio/MouseButtonCodes.h → ...io/src/StarStudio/Core/MouseButtonCodes.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion StarStudio/src/StarStudio/Window.h → StarStudio/src/StarStudio/Core/Window.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "sspch.h"

#include "StarStudio/Core.h"
#include "StarStudio/Core/Core.h"
#include "StarStudio/Events/Event.h"

namespace StarStudio {
Expand Down
2 changes: 1 addition & 1 deletion StarStudio/src/StarStudio/Events/Event.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "sspch.h"
#include "StarStudio/Core.h"
#include "StarStudio/Core/Core.h"

namespace StarStudio {

Expand Down
2 changes: 1 addition & 1 deletion StarStudio/src/StarStudio/ImGui/ImGuiLayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "backends/imgui_impl_glfw.h"
#include "backends/imgui_impl_opengl3.h"

#include "StarStudio/Application.h"
#include "StarStudio/Core/Application.h"

// TEMPORARY
#include <GLFW/glfw3.h>
Expand Down
2 changes: 1 addition & 1 deletion StarStudio/src/StarStudio/ImGui/ImGuiLayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "StarStudio/Layer.h"
#include "StarStudio/Core/Layer.h"

#include "StarStudio/Events/ApplicationEvent.h"
#include "StarStudio/Events/KeyEvent.h"
Expand Down
2 changes: 1 addition & 1 deletion StarStudio/src/StarStudio/Renderer/Texture.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <string>

#include "StarStudio/Core.h"
#include "StarStudio/Core/Core.h"

namespace StarStudio{

Expand Down
2 changes: 1 addition & 1 deletion StarStudio/src/sspch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <unordered_map>
#include <unordered_set>

#include "StarStudio/Log.h"
#include "StarStudio/Core/Log.h"

#ifdef SS_PLATFORM_WINDOWS
#include <Windows.h>
Expand Down
7 changes: 3 additions & 4 deletions GenerateProject.bat → scripts/Win-GenProjects.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@echo off
pushd ..\
call vendor\bin\premake\premake5.exe vs2022
IF %ERRORLEVEL% NEQ 0 (
PAUSE
)
popd
PAUSE
Loading