Skip to content

Commit

Permalink
Regular merge (#20)
Browse files Browse the repository at this point in the history
  • Loading branch information
roeas authored Aug 16, 2024
1 parent 97a4b18 commit d79406b
Show file tree
Hide file tree
Showing 12 changed files with 8 additions and 14,956 deletions.
File renamed without changes.
7,474 changes: 0 additions & 7,474 deletions Frame/Asset/model/bunnyAssignment6/bunny.obj

This file was deleted.

7,474 changes: 0 additions & 7,474 deletions Frame/Asset/model/bunnyAssignment7/bunny.obj

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion Frame/Source/Assignment/Assignment6/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ int main(int argc, char** argv)
{
Scene scene(1280, 960);

MeshTriangle bunny(Utils::PathFromAsset("model/bunnyAssignment6/bunny.obj"));
MeshTriangle bunny(Utils::PathFromAsset("model/bunny/bunny.obj"));

scene.Add(&bunny);
scene.Add(std::make_unique<Light>(Vector3f(-20, 70, 20), 1));
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ GAMES101-Premake 是一个使用 Premake5 一键配置 GAMES101 作业运行环
`git clone https://github.com/roeas/GAMES101-Premake`

### 2. 编译第三方库
运行 `SetupThirdParty.bat`
运行 `SetupThirdParty.bat`

### 3. 生成 VS2022 solution
运行 `Setup.bat`
运行 `Setup.bat`

### 4. 搞定!
打开根目录的 `Frame.sln` 即可。
Expand All @@ -37,20 +37,20 @@ GAMES101-Premake 是一个使用 Premake5 一键配置 GAMES101 作业运行环

# 其他
- 框架相关
- 文档位于 `GAMES101-Premake/Document`
- 官方提供的代码有不少问题,如果出现上下/前后颠倒的情况可以参考:[《GAMES101》作业框架问题详解](https://zhuanlan.zhihu.com/p/509902950)
- 文档位于 `GAMES101-Premake/Document`
- 官方的代码有不少问题,如果出现上下/前后颠倒的情况可以参考:[《GAMES101》作业框架问题详解](https://zhuanlan.zhihu.com/p/509902950)
- 作业之间没有任何关系,在一作业内的修改不会应用到另一作业中,编写时注意区分。
- 修改了一些路径相关的代码以适配框架:
- 模型位于 `GAMES101-Premake/Frame/Asset/model`
- 作业 5、6、7 的输出位于 `GAMES101-Premake/Frame/Asset/output`
- 模型位于 `GAMES101-Premake/Frame/Asset/model`
- 作业 5、6、7 的输出位于 `GAMES101-Premake/Frame/Asset/output`
- 魔改了作业 8 的依赖,遇到任何问题请通过 issue 让我知道。

- C++ 版本:20

- Eigen 版本:3.4.0

- OpenCV 版本:4.8.1
- OpenCV 依赖项的下载源已设置为由 OpenCV 中国和 GitCode 维护的国内仓库 [OpenCV](https://gitcode.net/opencv/opencv)
- OpenCV 依赖项的下载源已设置为由 OpenCV 中国和 GitCode 维护的国内仓库 [OpenCV](https://gitcode.net/opencv/opencv)
- TODO:取消 OpenCV 不必要模块的编译。

- Freetype 版本:2.13.2
Expand Down

0 comments on commit d79406b

Please sign in to comment.