Skip to content

Commit

Permalink
Merge pull request #18 from Asmilex/vulkan-setup
Browse files Browse the repository at this point in the history
[:sparkles:] Path tracer básico listo!
  • Loading branch information
Asmilex authored Feb 17, 2022
2 parents 73b142b + ebca093 commit 773c0ae
Show file tree
Hide file tree
Showing 176 changed files with 7,706 additions and 11,826 deletions.
103 changes: 77 additions & 26 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# Created by https://www.toptal.com/developers/gitignore/api/latex,c++,visualstudiocode
# Edit at https://www.toptal.com/developers/gitignore?templates=latex,c++,visualstudiocode
# Created by https://www.toptal.com/developers/gitignore/api/visualstudiocode,c++,cmake,latex,visualstudio,windows
# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,c++,cmake,latex,visualstudio,windows

### C++ ###
# Prerequisites
Expand Down Expand Up @@ -36,6 +36,23 @@
*.out
*.app

### CMake ###
CMakeLists.txt.user
CMakeCache.txt
CMakeFiles
CMakeScripts
Testing
Makefile
cmake_install.cmake
install_manifest.txt
compile_commands.json
CTestTestfile.cmake
_deps

### CMake Patch ###
# External projects
*-prefix/

### LaTeX ###
## Core latex/pdflatex auxiliary files:
*.aux
Expand Down Expand Up @@ -149,10 +166,16 @@ acs-*.bib
*.glsdefs
*.lzo
*.lzs
*.slg
*.sls

# uncomment this for glossaries-extra (will ignore makeindex's style files!)
# *.ist

# gnuplot
*.gnuplot
*.table

# gnuplottex
*-gnuplottex-*

Expand Down Expand Up @@ -227,6 +250,9 @@ _minted*
# scrwfile
*.wrt

# svg
svg-inkscape/

# sympy
*.sout
*.sympy
Expand All @@ -251,6 +277,9 @@ pythontex-files-*/
*.md5
*.auxlock

# titletoc
*.ptc

# todonotes
*.tdo

Expand Down Expand Up @@ -338,25 +367,52 @@ TSWLatexianTemp*
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace
!.vscode/*.code-snippets

# Local History for Visual Studio Code
.history/

# Built Visual Studio Code Extensions
*.vsix

### VisualStudioCode Patch ###
# Ignore all local history of files
.history
.ionide

# Support for Project snippet scope

### Windows ###
# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Created by https://www.toptal.com/developers/gitignore/api/visualstudio
# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudio
# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk

### VisualStudio ###
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore

# User-specific files
*.rsuser
Expand Down Expand Up @@ -429,9 +485,7 @@ StyleCopReport.xml
*_h.h
*.ilk
*.meta
*.obj
*.iobj
*.pch
*.pdb
*.ipdb
*.pgc
Expand All @@ -444,7 +498,6 @@ StyleCopReport.xml
*.tmp
*.tmp_proj
*_wpftmp.csproj
*.log
*.tlog
*.vspscc
*.vssscc
Expand Down Expand Up @@ -561,9 +614,6 @@ PublishScripts/
*.nuget.props
*.nuget.targets

# Nuget personal access tokens and Credentials
nuget.config

# Microsoft Azure Build Output
csx/
*.build.csdef
Expand Down Expand Up @@ -652,6 +702,15 @@ node_modules/
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw

# Visual Studio 6 auto-generated project file (contains which files were open etc.)
*.vbp

# Visual Studio 6 workspace and project file (working project files containing files to include in project)
*.dsw
*.dsp

# Visual Studio 6 technical files

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
Expand Down Expand Up @@ -708,6 +767,9 @@ ASALocalRun/
# Local History for Visual Studio
.localhistory/

# Visual Studio History (VSHistory) files
.vshistory/

# BeatPulse healthcheck temp database
healthchecksdb

Expand All @@ -721,30 +783,19 @@ MigrationBackup/
FodyWeavers.xsd

# VS Code files for those working on multiple tools
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace

# Local History for Visual Studio Code
.history/

# Windows Installer files from build outputs
*.cab
*.msi
*.msix
*.msm
*.msp

# JetBrains Rider
.idea/
*.sln.iml

### VisualStudio Patch ###
# Additional files built by Visual Studio

# End of https://www.toptal.com/developers/gitignore/api/visualstudio
# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode,c++,cmake,latex,visualstudio,windows

# End of https://www.toptal.com/developers/gitignore/api/latex,c++,visualstudiocode
!.vscode/c_cpp_properties.json
log_*.txt
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "application/nvpro_core"]
path = application/nvpro_core
url = https://github.com/nvpro-samples/nvpro_core.git
21 changes: 21 additions & 0 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"configurations": [
{
"name": "Win32",
"includePath": [
"${workspaceFolder}/**",
"C:/VulkanSDK/1.2.182.0/Include"
],
"defines": [
"_DEBUG",
"UNICODE",
"_UNICODE"
],
"windowsSdkVersion": "10.0.19041.0",
"compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30037/bin/Hostx64/x64/cl.exe",
"intelliSenseMode": "windows-msvc-x64"

}
],
"version": 4
}
11 changes: 11 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@
// Para más información, visite: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "(Debug) Asmiray",
"type": "cppvsdbg",
"request": "launch",
"program": "${workspaceFolder}/application/bin_x64/Debug/asmiray.exe",
"stopAtEntry": false,
"cwd": "${workspaceRoot}",
"environment": [],
"console": "externalTerminal",
"preLaunchTask": "Compile debug asmiray"
},
{
"name": "(Debug) RT in one weekend",
"type": "cppvsdbg",
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
"xstddef": "cpp",
"xstring": "cpp",
"xtr1common": "cpp",
"xutility": "cpp"
"xutility": "cpp",
"array": "cpp"
},
"spellright.language": [
"en",
Expand Down
12 changes: 12 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Compile debug asmiray",
"command": "cmake",
"type": "shell",
"args": [
"--build",
"."
],
"options": {
"cwd": "${workspaceFolder}/application/vulkan_ray_tracing/build"
}
},
{
"label": "Compile debug RT in one weekend",
"command": "cmake",
Expand Down
16 changes: 15 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,20 @@ Actualmente se encuentra en una fase temprana de desarrollo. Con un poco de suer

## :gear: Instalación

Lo siento, ¡todavía no está listo! Vuelve en el futuro.
Requiere tener Vulkan instalado, un driver de Nvidia compatible con Vulkan, Cmake.

Clona este repositorio con `git clone --recursive --shallow-submodules https://github.com/Asmilex/Raytracing.git`.

Para construir el motor, hace falta lo siguiente:

```
cd .\application\vulkan_ray_tracing\
mkdir build
cd build
cmake ..
```

Cuando se haya ejecutado, deberían haber aparecido los makefiles necesarios. Si abres VSCode, en la pestaña de *Run and Debug*, deberías tener una opción para lanzar Asmiray. Debería ir.

## :evergreen_tree: Estructura del repositorio

Expand Down Expand Up @@ -111,3 +124,4 @@ En esta sección se recopilan enlaces útiles para el desarrollo del motor. Se i
- [Explicación interesante sobre GI de Digital Foundry](https://www.youtube.com/watch?v=yEkryaaAsBU)
- [Ray Tracing Gems I](https://www.realtimerendering.com/raytracinggems/rtg/index.html)
- [Ray Tracing Gems II](https://developer.nvidia.com/ray-tracing-gems-ii)
- [Awesome ray tracing](https://github.com/dannyfritz/awesome-ray-tracing#vulkan-ray-tracing)
19 changes: 0 additions & 19 deletions application/.vscode/launch.json

This file was deleted.

3 changes: 0 additions & 3 deletions application/.vscode/settings.json

This file was deleted.

Loading

0 comments on commit 773c0ae

Please sign in to comment.