Skip to content
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.

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

Fix typos #37

Merged
merged 1 commit into from
Apr 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ To build Pilot, you must first install the following tools.
- CMake 3.19 (or more recent)
- Git 2.1 (or more recent)

### MacOS >= 10.15 (x86_64)
### macOS >= 10.15 (x86_64)
- Xcode 12.3 (or more recent)
- CMake 3.19 (or more recent)
- Git 2.1 (or more recent)
Expand Down Expand Up @@ -45,7 +45,7 @@ Or you can use the following command to generate the **Visual Studio** project f
cmake -S engine/ -B build
```

### Build on MacOS
### Build on macOS

> The following build instructions only tested on specific hardware of x86_64, and do not support M1 chips. For M1 compatible, we will release later.

Expand Down
2 changes: 1 addition & 1 deletion engine/source/editor/include/editor_ui.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ namespace Pilot
void showEditorWorldObjectsWindow(bool* p_open);
void showEditorFileContentWindow(bool* p_open);
void showEditorGameWindow(bool* p_open);
void showEditorDetialWindow(bool* p_open);
void showEditorDetailWindow(bool* p_open);

void onReset();
void onCursorPos(double xpos, double ypos);
Expand Down
6 changes: 3 additions & 3 deletions engine/source/editor/source/editor_ui.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "editor/include/editor_ui.h"

#include "editor//include/editor.h"
#include "editor/include/editor.h"

#include "runtime/core/base/macro.h"
#include "runtime/core/meta/reflection/reflection.h"
Expand Down Expand Up @@ -284,7 +284,7 @@ namespace Pilot
showEditorWorldObjectsWindow(&asset_window_open);
showEditorGameWindow(&game_engine_window_open);
showEditorFileContentWindow(&file_content_window_open);
showEditorDetialWindow(&detail_window_open);
showEditorDetailWindow(&detail_window_open);
}

void EditorUI::showEditorMenu(bool* p_open)
Expand Down Expand Up @@ -490,7 +490,7 @@ namespace Pilot
delete[] fields;
}

void EditorUI::showEditorDetialWindow(bool* p_open)
void EditorUI::showEditorDetailWindow(bool* p_open)
{
ImGuiWindowFlags window_flags = ImGuiWindowFlags_None;

Expand Down
2 changes: 1 addition & 1 deletion engine/source/editor/source/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <thread>
#include <unordered_map>

#include "editor//include/editor.h"
#include "editor/include/editor.h"
#include "runtime/engine.h"

// https://gcc.gnu.org/onlinedocs/cpp/Stringizing.html
Expand Down