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

Project 5: Zhihao Ruan #6

Open
wants to merge 44 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
c727841
git discard built binaries
Oct 23, 2021
aa523f8
add clang-format & gitignores
Oct 23, 2021
53b7749
fix type inconsistencies
Oct 23, 2021
5f20821
include missing haeders for gcc; add class Instance declaration
Oct 25, 2021
ffb6bbc
update GLFW to 3.3.4
Oct 28, 2021
6b2b243
fix minor typos
Oct 29, 2021
f376c56
add find for GLSLValidator for Linux shader compilation
Oct 29, 2021
3e743be
Merge pull request #1 from shineyruan/feature/enable_shader_compile_l…
shineyruan Oct 29, 2021
8ee027f
reformat shaders with clang-format
Oct 30, 2021
9e6ac5a
finish allocating compute descriptor sets
Oct 31, 2021
3b75c16
finished grass vertex shader
Oct 31, 2021
f095710
finish grass descriptor sets for model matrix
Oct 31, 2021
f68c1e4
add detailed comments for uniform buffer source
Oct 31, 2021
57cc34b
finish grass rendering pipeline shaders
Nov 1, 2021
30ba80d
update compute shader numBlades results in compute shader
Nov 1, 2021
7d430b2
set Vulkan vertex buffer bit for Blades buffer creation
Nov 1, 2021
571c840
fix misuse of iterator i and j in binding grass pipeline
Nov 1, 2021
67d5918
multiple visual effect updates
Nov 1, 2021
b1fcaa7
increase window size for hiDPI screens
Nov 1, 2021
16b3e6c
finished physically-based grass simulation
Nov 1, 2021
435bcef
finished culling
Nov 1, 2021
af41487
adjust color in fragment shader
Nov 1, 2021
915c1cc
enable all culling
Nov 1, 2021
53c995a
add basic highlights in README
Nov 1, 2021
2733b04
finish introduction section
Nov 1, 2021
51938bd
add visual effects
Nov 1, 2021
da9e227
add upstraight grass blade demo
Nov 1, 2021
7646ffa
add FPS utilities
Nov 1, 2021
7afbf1f
add performance analysis
Nov 1, 2021
87412be
update glm version
Nov 11, 2021
560650f
fix missing header for memcpy
Nov 11, 2021
8d0ac6e
update compiled shader dir to compile on Linux
Nov 11, 2021
21b31e4
add standard cmake msg for Vulkan display options
Nov 11, 2021
b2dc8f3
add spdlog dependency
Nov 12, 2021
dd1be66
add separate binary dirs for Windows/Linux
Nov 12, 2021
068dd33
Merge pull request #2 from shineyruan/feature/enable_shader_compile_l…
shineyruan Nov 13, 2021
611117e
update stb version
Nov 13, 2021
bf4cf64
fix findXCB warnings
Nov 13, 2021
875e2da
fix type conversion warnings
Nov 13, 2021
d18945b
add output indicating shader source dir
Nov 13, 2021
28ebb7b
enforce clean code styles by adding compile flags
Nov 13, 2021
494b9aa
introduce cmake config header file for dynamic build dir
Nov 17, 2021
8b3d691
add support for AppleClang
Dec 5, 2021
e9812d6
add missing headers
shineyruan Nov 22, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
update glm version
Zhihao Ruan committed Nov 11, 2021
commit 87412befb429fb9911d94d77f925713e27a913be
2 changes: 1 addition & 1 deletion external/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -5,5 +5,5 @@ set(GLFW_BUILD_DOCS OFF CACHE BOOL "Build the GLFW documentation")
set(GLFW_INSTALL OFF CACHE BOOL "Generate installation target")
add_subdirectory(glfw-3.3.4)

set(GLM_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/glm PARENT_SCOPE)
set(GLM_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/glm-0.9.9.8 PARENT_SCOPE)
set(STB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/stb PARENT_SCOPE)
87 changes: 87 additions & 0 deletions external/glm-0.9.9.8/.appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
shallow_clone: true

platform:
- x86
- x64

configuration:
- Debug
- Release

image:
- Visual Studio 2013
- Visual Studio 2015
- Visual Studio 2017
- Visual Studio 2019

environment:
matrix:
- GLM_ARGUMENTS: -DGLM_TEST_FORCE_PURE=ON
- GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
- GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
- GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_CXX_14=ON
- GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_CXX_17=ON

matrix:
exclude:
- image: Visual Studio 2013
GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
- image: Visual Studio 2013
GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_CXX_14=ON
- image: Visual Studio 2013
GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_CXX_17=ON
- image: Visual Studio 2013
configuration: Debug
- image: Visual Studio 2015
GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_SSE2=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
- image: Visual Studio 2015
GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_CXX_14=ON
- image: Visual Studio 2015
GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_CXX_17=ON
- image: Visual Studio 2015
platform: x86
- image: Visual Studio 2015
configuration: Debug
- image: Visual Studio 2017
platform: x86
- image: Visual Studio 2017
configuration: Debug
- image: Visual Studio 2019
platform: x64

before_build:
- ps: |
mkdir build
cd build

if ("$env:APPVEYOR_JOB_NAME" -match "Image: Visual Studio 2013") {
$env:generator="Visual Studio 12 2013"
}
if ("$env:APPVEYOR_JOB_NAME" -match "Image: Visual Studio 2015") {
$env:generator="Visual Studio 14 2015"
}
if ("$env:APPVEYOR_JOB_NAME" -match "Image: Visual Studio 2017") {
$env:generator="Visual Studio 15 2017"
}
if ("$env:APPVEYOR_JOB_NAME" -match "Image: Visual Studio 2019") {
$env:generator="Visual Studio 16 2019"
}
if ($env:PLATFORM -eq "x64") {
$env:generator="$env:generator Win64"
}
echo generator="$env:generator"
cmake .. -G "$env:generator" -DGLM_QUIET=ON -DGLM_TEST_ENABLE=ON "$env:GLM_ARGUMENTS"

build_script:
- cmake --build . --config %CONFIGURATION% -- /m /v:minimal

test_script:
- ctest -j4 -C %CONFIGURATION%
- cd ..
- ps: |
mkdir build_test_cmake
cd build_test_cmake
cmake ..\test\cmake\ -G "$env:generator" -Dglm_DIR="$env:APPVEYOR_BUILD_FOLDER/cmake/glm/"
- cmake --build . --config %CONFIGURATION% -- /m /v:minimal

deploy: off
61 changes: 61 additions & 0 deletions external/glm-0.9.9.8/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app

# CMake
CMakeCache.txt
CMakeFiles
cmake_install.cmake
install_manifest.txt
*.cmake
!glmConfig.cmake
!glmConfig-version.cmake
# ^ May need to add future .cmake files as exceptions

# Test logs
Testing/*

# Test input
test/gtc/*.dds

# Project Files
Makefile
*.cbp
*.user

# Misc.
*.log

# local build(s)
build*

/.vs
/.vscode
/CMakeSettings.json
.DS_Store
*.swp
Loading