Merge pull request #1034 from SaschaWillems/assets_submodule

Include assets as a submodule
This commit is contained in:
Sascha Willems 2023-05-11 19:02:10 +02:00 committed by GitHub
commit a048bc2635
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1343 changed files with 806 additions and 745 deletions

4
.gitmodules vendored
View file

@ -1,3 +1,7 @@
[submodule "external/glm"]
path = external/glm
url = https://github.com/g-truc/glm
[submodule "assets"]
path = assets
url = https://github.com/SaschaWillems/Vulkan-Assets
branch = main

View file

@ -120,10 +120,13 @@ function(buildExamples)
endfunction(buildExamples)
if(RESOURCE_INSTALL_DIR)
add_definitions(-DVK_EXAMPLE_DATA_DIR=\"${RESOURCE_INSTALL_DIR}/\")
install(DIRECTORY data/ DESTINATION ${RESOURCE_INSTALL_DIR}/)
add_definitions(-DVK_EXAMPLE_ASSETS_DIR=\"${RESOURCE_INSTALL_DIR}/\")
add_definitions(-DVK_EXAMPLE_SHADERS_DIR=\"${RESOURCE_INSTALL_DIR}/\")
install(DIRECTORY assets/ DESTINATION ${RESOURCE_INSTALL_DIR}/)
install(DIRECTORY shader/ DESTINATION ${RESOURCE_INSTALL_DIR}/)
else()
add_definitions(-DVK_EXAMPLE_DATA_DIR=\"${CMAKE_SOURCE_DIR}/data/\")
add_definitions(-DVK_EXAMPLE_ASSETS_DIR=\"${CMAKE_SOURCE_DIR}/assets/\")
add_definitions(-DVK_EXAMPLE_SHADERS_DIR=\"${CMAKE_SOURCE_DIR}/shaders/\")
endif()
# Compiler specific stuff

View file

@ -39,7 +39,7 @@ You can find this repository at https://github.com/KhronosGroup/Vulkan-Samples
As I've been involved with getting the official repository up and running, I'll be mostly contributing to that repository from now, but may still add samples that don't fit there in here and I'll of course continue to maintain these samples.
## Cloning
This repository contains submodules for external dependencies, so when doing a fresh clone you need to clone recursively:
This repository contains submodules for external dependencies and assets, so when doing a fresh clone you need to clone recursively:
```
git clone --recursive https://github.com/SaschaWillems/Vulkan.git
@ -53,11 +53,8 @@ git submodule update
```
## Assets
Many examples require assets from the asset pack that is not part of this repository due to file size. A python script is included to download the asset pack that. Run
python download_assets.py
from the root of the repository after cloning or see [this](data/README.md) for manual download.
**Important notice:** As of may 2023 assets have been moved to a [submodule](https://github.com/SaschaWillems/Vulkan-Assets). If you have cloned the repository before this date, you may need to initialize and update submodules. If you do a fresh clone, no action is required to get the assets.
## Building

View file

@ -1,4 +1,10 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
/**
* Copyright (C) 2016-2023 by Sascha Willems - www.saschawillems.de
*
* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
*/
/** Top-level build file where you can add configuration options common to all sub-projects/modules */
buildscript {
repositories {
@ -6,7 +12,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.0'
classpath 'com.android.tools.build:gradle:7.0.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
@ -17,4 +23,12 @@ allprojects {
google()
jcenter()
}
}
ext {
minSdkVersion = 19
targetSdkVersion = 26
compileSdkVersion = 26
shaderPath = '../../../shaders/'
assetPath = '../../../assets/'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.%PACKAGE_NAME%"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,7 +43,7 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanBloom"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,37 +43,37 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/bloom'
from rootProject.ext.shaderPath +'glsl/bloom'
into 'assets/shaders/glsl/bloom'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath +'models'
into 'assets/models'
include 'retroufo.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath +'models'
into 'assets/models'
include 'retroufo_glow.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath +'models'
into 'assets/models'
include 'cube.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'cubemap_space.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanComputecloth"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,25 +43,25 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/computecloth'
from rootProject.ext.shaderPath + 'glsl/computecloth'
into 'assets/shaders/glsl/computecloth'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'sphere.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'vulkan_cloth_rgba.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanComputecullandlod"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/computecullandlod'
from rootProject.ext.shaderPath + 'glsl/computecullandlod'
into 'assets/shaders/glsl/computecullandlod'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'suzanne_lods.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanComputeheadless"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,13 +43,13 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/computeheadless'
from rootProject.ext.shaderPath + 'glsl/computeheadless'
into 'assets/shaders/glsl/computeheadless'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanComputenbody"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,25 +43,25 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/computenbody'
from rootProject.ext.shaderPath + 'glsl/computenbody'
into 'assets/shaders/glsl/computenbody'
include '*.*'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'particle01_rgba.ktx'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'particle_gradient_rgba.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanComputeparticles"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,25 +43,25 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/computeparticles'
from rootProject.ext.shaderPath + 'glsl/computeparticles'
into 'assets/shaders/glsl/computeparticles'
include '*.*'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'particle01_rgba.ktx'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'particle_gradient_rgba.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanComputeRaytracing"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,13 +43,13 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/computeraytracing'
from rootProject.ext.shaderPath + 'glsl/computeraytracing'
into 'assets/shaders/glsl/computeraytracing'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanComputeshader"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/computeshader'
from rootProject.ext.shaderPath + 'glsl/computeshader'
into 'assets/shaders/glsl/computeshader'
include '*.*'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'vulkan_11_rgba.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanConservativeraster"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,13 +43,13 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/conservativeraster'
from rootProject.ext.shaderPath + 'glsl/conservativeraster'
into 'assets/shaders/glsl/conservativeraster'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanDebugmarker"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,25 +43,25 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/debugmarker'
from rootProject.ext.shaderPath + 'glsl/debugmarker'
into 'assets/shaders/glsl/debugmarker'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'treasure_smooth.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'treasure_glow.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanDeferred"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,37 +43,37 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/deferred'
from rootProject.ext.shaderPath + 'glsl/deferred'
into 'assets/shaders/glsl/deferred'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'deferred_floor.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'stonefloor01_color_*.ktx'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'stonefloor01_normal_*.ktx'
}
copy {
from '../../../data/models/armor'
from rootProject.ext.assetPath + 'models/armor'
into 'assets/models/armor'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanDeferredmultisampling"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,37 +43,37 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/deferredmultisampling'
from rootProject.ext.shaderPath + 'glsl/deferredmultisampling'
into 'assets/shaders/glsl/deferredmultisampling'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'deferred_box.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'stonefloor02_color_*.ktx'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'stonefloor02_normal_*.ktx'
}
copy {
from '../../../data/models/armor'
from rootProject.ext.assetPath + 'models/armor'
into 'assets/models/armor'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanDeferredshadows"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,37 +43,37 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/deferredshadows'
from rootProject.ext.shaderPath + 'glsl/deferredshadows'
into 'assets/shaders/glsl/deferredshadows'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'deferred_box.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'stonefloor02_color_*.ktx'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'stonefloor02_normal_*.ktx'
}
copy {
from '../../../data/models/armor'
from rootProject.ext.assetPath + 'models/armor'
into 'assets/models/armor'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanDescriptorindexing"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,13 +43,13 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/descriptorindexing'
from rootProject.ext.shaderPath + 'glsl/descriptorindexing'
into 'assets/shaders/glsl/descriptorindexing'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanDescriptorsets"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,31 +43,31 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/descriptorsets'
from rootProject.ext.shaderPath + 'glsl/descriptorsets'
into 'assets/shaders/glsl/descriptorsets'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'cube.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'crate01_color_height_rgba.ktx'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'crate02_color_height_rgba.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanDisplacement"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,25 +43,25 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/displacement'
from rootProject.ext.shaderPath + 'glsl/displacement'
into 'assets/shaders/glsl/displacement'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'displacement_plane.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'stonefloor03_color_height_rgba.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanDistancefieldfonts"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,31 +43,31 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/distancefieldfonts'
from rootProject.ext.shaderPath + 'glsl/distancefieldfonts'
into 'assets/shaders/glsl/distancefieldfonts'
include '*.*'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'font_sdf_rgba.ktx'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'font_bitmap_rgba.ktx'
}
copy {
from '../../../data/./'
from rootProject.ext.assetPath + './'
into 'assets/./'
include 'font.fnt'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanDynamicuniformbuffer"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,13 +43,13 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/dynamicuniformbuffer'
from rootProject.ext.shaderPath + 'glsl/dynamicuniformbuffer'
into 'assets/shaders/glsl/dynamicuniformbuffer'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanGears"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,13 +43,13 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/gears'
from rootProject.ext.shaderPath + 'glsl/gears'
into 'assets/shaders/glsl/gears'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanGeometryshader"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/geometryshader'
from rootProject.ext.shaderPath + 'glsl/geometryshader'
into 'assets/shaders/glsl/geometryshader'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'suzanne.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanglTFScene"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/gltfloading'
from rootProject.ext.shaderPath + 'glsl/gltfloading'
into 'assets/shaders/glsl/gltfloading'
include '*.*'
}
copy {
from '../../../data/models/FlightHelmet/glTF'
from rootProject.ext.assetPath + 'models/FlightHelmet/glTF'
into 'assets/models/FlightHelmet/glTF'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanScenerendering"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/gltfscenerendering'
from rootProject.ext.shaderPath +'glsl/gltfscenerendering'
into 'assets/shaders/glsl/gltfscenerendering'
include '*.*'
}
copy {
from '../../../data/models/sponza'
from rootProject.ext.assetPath + 'models/sponza'
into 'assets/models/sponza'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanglTFSkinning"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into "assets/shaders/glsl/base"
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/gltfskinning'
from rootProject.ext.shaderPath + 'glsl/gltfskinning'
into 'assets/shaders/glsl/gltfskinning'
include '*.*'
}
copy {
from '../../../data/models/CesiumMan/glTF'
from rootProject.ext.assetPath + 'models/CesiumMan/glTF'
into 'assets/models/CesiumMan/glTF'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanHDR"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,49 +43,49 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/hdr'
from rootProject.ext.shaderPath + 'glsl/hdr'
into 'assets/shaders/glsl/hdr'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'cube.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'sphere.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'teapot.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'torusknot.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'venus.gltf'
}
copy {
from '../../../data/textures/hdr'
from rootProject.ext.assetPath + 'textures/hdr'
into 'assets/textures/hdr'
include 'uffizi_cube.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanImGui"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,31 +43,31 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/imgui'
from rootProject.ext.shaderPath + 'glsl/imgui'
into 'assets/shaders/glsl/imgui'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'vulkanscenemodels.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'vulkanscenebackground.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'vulkanscenelogos.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanIndirectdraw"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,43 +43,43 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/indirectdraw'
from rootProject.ext.shaderPath + 'glsl/indirectdraw'
into 'assets/shaders/glsl/indirectdraw'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'plants.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'plane_circle.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'sphere.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'texturearray_plants_rgba.ktx'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'ground_dry_rgba.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanInlineuniformblocks"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/inlineuniformblocks'
from rootProject.ext.shaderPath + 'glsl/inlineuniformblocks'
into 'assets/shaders/glsl/inlineuniformblocks'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'sphere.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanInputattachments"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -48,19 +48,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/inputattachments'
from rootProject.ext.shaderPath + 'glsl/inputattachments'
into 'assets/shaders/glsl/inputattachments'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'treasure_smooth.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanInstancing"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,37 +43,37 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/instancing'
from rootProject.ext.shaderPath + 'glsl/instancing'
into 'assets/shaders/glsl/instancing'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'rock01.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'lavaplanet.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'texturearray_rocks*.ktx'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'lavaplanet*.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanMultisampling"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/multisampling'
from rootProject.ext.shaderPath + 'glsl/multisampling'
into 'assets/shaders/glsl/multisampling'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'voyager.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanMultithreading"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,25 +43,25 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/multithreading'
from rootProject.ext.shaderPath + 'glsl/multithreading'
into 'assets/shaders/glsl/multithreading'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'retroufo_red_lowpoly.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'sphere.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanMultiview"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/multiview'
from rootProject.ext.shaderPath + 'glsl/multiview'
into 'assets/shaders/glsl/multiview'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'sampleroom.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanNegativeviewportheight"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,25 +43,25 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/negativeviewportheight'
from rootProject.ext.shaderPath + 'glsl/negativeviewportheight'
into 'assets/shaders/glsl/negativeviewportheight'
include '*.*'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'texture_orientation_ccw_rgba.ktx'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'texture_orientation_cw_rgba.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanOcclusionquery"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,31 +43,31 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/occlusionquery'
from rootProject.ext.shaderPath + 'glsl/occlusionquery'
into 'assets/shaders/glsl/occlusionquery'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'plane_z.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'teapot.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'sphere.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanOffscreen"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,25 +43,25 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/offscreen'
from rootProject.ext.shaderPath + 'glsl/offscreen'
into 'assets/shaders/glsl/offscreen'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'plane.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'chinesedragon.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanOrderIndependentTransparency"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,25 +43,25 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/oit'
from rootProject.ext.shaderPath + 'glsl/oit'
into 'assets/shaders/glsl/oit'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'sphere.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'cube.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanParallaxmapping"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,31 +43,31 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/parallaxmapping'
from rootProject.ext.shaderPath + 'glsl/parallaxmapping'
into 'assets/shaders/glsl/parallaxmapping'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'planecd.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'rocks_normal_height_rgba.ktx'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'rocks_color*.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanParticlefire"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,43 +43,43 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/particlefire'
from rootProject.ext.shaderPath + 'glsl/particlefire'
into 'assets/shaders/glsl/particlefire'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'fireplace.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'particle_fire.ktx'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'particle_smoke.ktx'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'fireplace_normalmap*.ktx'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'fireplace_colormap*.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanPBRBasic"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,37 +43,37 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/pbrbasic'
from rootProject.ext.shaderPath + 'glsl/pbrbasic'
into 'assets/shaders/glsl/pbrbasic'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'sphere.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'teapot.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'torusknot.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'venus.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanPBRIBL"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,49 +43,49 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/pbribl'
from rootProject.ext.shaderPath + 'glsl/pbribl'
into 'assets/shaders/glsl/pbribl'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'cube.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'sphere.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'teapot.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'torusknot.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'venus.gltf'
}
copy {
from '../../../data/textures/hdr'
from rootProject.ext.assetPath + 'textures/hdr'
into 'assets/textures/hdr'
include 'pisa_cube.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanPBRTexture"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,31 +43,31 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/pbrtexture'
from rootProject.ext.shaderPath + 'glsl/pbrtexture'
into 'assets/shaders/glsl/pbrtexture'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'cube.gltf'
}
copy {
from '../../../data/textures/hdr'
from rootProject.ext.assetPath + 'textures/hdr'
into 'assets/textures/hdr'
include 'gcanyon_cube.ktx'
}
copy {
from '../../../data/models/cerberus'
from rootProject.ext.assetPath + 'models/cerberus'
into 'assets/models/cerberus'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanPipelines"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/pipelines'
from rootProject.ext.shaderPath + 'glsl/pipelines'
into 'assets/shaders/glsl/pipelines'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'treasure_smooth.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanPipelinestatistics"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,37 +43,37 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/pipelinestatistics'
from rootProject.ext.shaderPath + 'glsl/pipelinestatistics'
into 'assets/shaders/glsl/pipelinestatistics'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'sphere.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'teapot.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'torusknot.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'venus.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanPushconstants"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,25 +43,25 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/pushconstants'
from rootProject.ext.shaderPath + 'glsl/pushconstants'
into 'assets/shaders/glsl/pushconstants'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'sphere.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'samplescene.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanPushdescriptors"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,31 +43,31 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/pushdescriptors'
from rootProject.ext.shaderPath + 'glsl/pushdescriptors'
into 'assets/shaders/glsl/pushdescriptors'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'cube.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'crate01_color_height_rgba.ktx'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'crate02_color_height_rgba.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanRadialblur"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,25 +43,25 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/radialblur'
from rootProject.ext.shaderPath + 'glsl/radialblur'
into 'assets/shaders/glsl/radialblur'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'glowsphere.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'particle_gradient_rgba.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanRayQuery"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/rayquery'
from rootProject.ext.shaderPath + 'glsl/rayquery'
into 'assets/shaders/glsl/rayquery'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'vulkanscene_shadow.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanRaytracingbasic"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,13 +43,13 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/raytracingbasic'
from rootProject.ext.shaderPath + 'glsl/raytracingbasic'
into 'assets/shaders/glsl/raytracingbasic'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanRaytracingreflections"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/raytracingreflections'
from rootProject.ext.shaderPath + 'glsl/raytracingreflections'
into 'assets/shaders/glsl/raytracingreflections'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'reflection_scene.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanRaytracingshadows"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/raytracingshadows'
from rootProject.ext.shaderPath + 'glsl/raytracingshadows'
into 'assets/shaders/glsl/raytracingshadows'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'vulkanscene_shadow.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanRenderheadless"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,13 +43,13 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/renderheadless'
from rootProject.ext.shaderPath + 'glsl/renderheadless'
into 'assets/shaders/glsl/renderheadless'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanScreenshot"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/screenshot'
from rootProject.ext.shaderPath + 'glsl/screenshot'
into 'assets/shaders/glsl/screenshot'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'chinesedragon.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanShadowmapping"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,25 +43,25 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/shadowmapping'
from rootProject.ext.shaderPath + 'glsl/shadowmapping'
into 'assets/shaders/glsl/shadowmapping'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'vulkanscene_shadow.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'samplescene.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanShadowmappingcascade"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,25 +43,25 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/shadowmappingcascade'
from rootProject.ext.shaderPath + 'glsl/shadowmappingcascade'
into 'assets/shaders/glsl/shadowmappingcascade'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'terrain_gridlines.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'oaktree.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanShadowmappingomni"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,25 +43,25 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/shadowmappingomni'
from rootProject.ext.shaderPath + 'glsl/shadowmappingomni'
into 'assets/shaders/glsl/shadowmappingomni'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'shadowscene_fire.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'cube.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanSpecializationconstants"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,25 +43,25 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/specializationconstants'
from rootProject.ext.shaderPath + 'glsl/specializationconstants'
into 'assets/shaders/glsl/specializationconstants'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'color_teapot_spheres.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'metalplate_nomips_rgba.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanSphericalenvmapping"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,25 +43,25 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/sphericalenvmapping'
from rootProject.ext.shaderPath + 'glsl/sphericalenvmapping'
into 'assets/shaders/glsl/sphericalenvmapping'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'chinesedragon.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'matcap_array_rgba.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanSSAO"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/ssao'
from rootProject.ext.shaderPath + 'glsl/ssao'
into 'assets/shaders/glsl/ssao'
include '*.*'
}
copy {
from '../../../data/models/sponza'
from rootProject.ext.assetPath + 'models/sponza'
into 'assets/models/sponza'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanStencilbuffer"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/stencilbuffer'
from rootProject.ext.shaderPath + 'glsl/stencilbuffer'
into 'assets/shaders/glsl/stencilbuffer'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'venus.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanSubpasses"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,31 +43,31 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/subpasses'
from rootProject.ext.shaderPath + 'glsl/subpasses'
into 'assets/shaders/glsl/subpasses'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'samplebuilding.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'samplebuilding_glass.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'colored_glass_rgba.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanTerraintessellation"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,37 +43,37 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/terraintessellation'
from rootProject.ext.shaderPath + 'glsl/terraintessellation'
into 'assets/shaders/glsl/terraintessellation'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'sphere.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'skysphere*.ktx'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'terrain_texturearray*.ktx'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'terrain_heightmap_r16.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanTessellation"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/tessellation'
from rootProject.ext.shaderPath + 'glsl/tessellation'
into 'assets/shaders/glsl/tessellation'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'deer.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanTextoverlay"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/textoverlay'
from rootProject.ext.shaderPath + 'glsl/textoverlay'
into 'assets/shaders/glsl/textoverlay'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'cube.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanTexture"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/texture'
from rootProject.ext.shaderPath + 'glsl/texture'
into 'assets/shaders/glsl/texture'
include '*.*'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'metalplate01_rgba.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanTexture3d"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,13 +43,13 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/texture3d'
from rootProject.ext.shaderPath + 'glsl/texture3d'
into 'assets/shaders/glsl/texture3d'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanTexturearray"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/texturearray'
from rootProject.ext.shaderPath + 'glsl/texturearray'
into 'assets/shaders/glsl/texturearray'
include '*.*'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'texturearray_rgba.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanTexturecubemap"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,49 +43,49 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/texturecubemap'
from rootProject.ext.shaderPath + 'glsl/texturecubemap'
into 'assets/shaders/glsl/texturecubemap'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'sphere.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'teapot.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'torusknot.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'cube.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'venus.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'cubemap_yokohama_rgba.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanTexturecubemapArray"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,49 +43,49 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/texturecubemaparray'
from rootProject.ext.shaderPath + 'glsl/texturecubemaparray'
into 'assets/shaders/glsl/texturecubemaparray'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'sphere.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'teapot.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'torusknot.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'cube.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'venus.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'cubemap_array.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanTexturemipmapgen"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,25 +43,25 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/texturemipmapgen'
from rootProject.ext.shaderPath + 'glsl/texturemipmapgen'
into 'assets/shaders/glsl/texturemipmapgen'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'tunnel_cylinder.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'metalplate_nomips_rgba.ktx'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanTriangle"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,13 +43,13 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/triangle'
from rootProject.ext.shaderPath + 'glsl/triangle'
into 'assets/shaders/glsl/triangle'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanVertexattributes"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/vertexattributes'
from rootProject.ext.shaderPath + 'glsl/vertexattributes'
into 'assets/shaders/glsl/vertexattributes'
include '*.*'
}
copy {
from '../../../data/models/sponza'
from rootProject.ext.assetPath + 'models/sponza'
into 'assets/models/sponza'
include '*.*'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanViewportarray"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,19 +43,19 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/viewportarray'
from rootProject.ext.shaderPath + 'glsl/viewportarray'
into 'assets/shaders/glsl/viewportarray'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'sampleroom.gltf'
}

View file

@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
apply from: '../gradle/outputfilename.gradle'
android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.saschawillems.vulkanVulkanscene"
minSdkVersion 19
targetSdkVersion 26
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
@ -43,43 +43,43 @@ task copyTask {
}
copy {
from '../../../data/shaders/glsl/base'
from rootProject.ext.shaderPath + 'glsl/base'
into 'assets/shaders/glsl/base'
include '*.spv'
}
copy {
from '../../../data/shaders/glsl/vulkanscene'
from rootProject.ext.shaderPath + 'glsl/vulkanscene'
into 'assets/shaders/glsl/vulkanscene'
include '*.*'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'vulkanscenelogos.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'vulkanscenebackground.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'vulkanscenemodels.gltf'
}
copy {
from '../../../data/models'
from rootProject.ext.assetPath + 'models'
into 'assets/models'
include 'cube.gltf'
}
copy {
from '../../../data/textures'
from rootProject.ext.assetPath + 'textures'
into 'assets/textures'
include 'cubemap_vulkan.ktx'
}

Binary file not shown.

View file

@ -1,7 +1,5 @@
#Sun Aug 04 12:29:22 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
org.gradle.jvmargs=-Xmx4096m

298
android/gradlew vendored
View file

@ -1,74 +1,129 @@
#!/usr/bin/env bash
#!/bin/sh
#
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################
##
## Gradle start up script for UN*X
##
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
app_path=$0
# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
APP_BASE_NAME=${0##*/}
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
MAX_FD=maximum
warn ( ) {
warn () {
echo "$*"
}
} >&2
die ( ) {
die () {
echo
echo "$*"
echo
exit 1
}
} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
nonstop=false
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD="$JAVA_HOME/bin/java"
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@ -77,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
@ -85,76 +140,95 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@"

53
android/gradlew.bat vendored
View file

@ -1,3 +1,19 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@ -8,20 +24,23 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -35,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@ -45,34 +64,14 @@ echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windowz variants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell

1
assets Submodule

@ -0,0 +1 @@
Subproject commit cef63c5c44cd0ad53e778ccdb150ff3b650183ab

View file

@ -34,7 +34,7 @@ namespace vks
#if defined(__ANDROID__)
AAsset* asset = AAssetManager_open(androidApp->activity->assetManager, filename.c_str(), AASSET_MODE_STREAMING);
if (!asset) {
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nThe file may be part of the additional asset pack.\n\nRun \"download_assets.py\" in the repository root to download the latest version.", -1);
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nMake sure the assets submodule has been checked out and is up-to-date.", -1);
}
size_t size = AAsset_getLength(asset);
assert(size > 0);
@ -45,7 +45,7 @@ namespace vks
delete[] textureData;
#else
if (!vks::tools::fileExists(filename)) {
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nThe file may be part of the additional asset pack.\n\nRun \"download_assets.py\" in the repository root to download the latest version.", -1);
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nMake sure the assets submodule has been checked out and is up-to-date.", -1);
}
result = ktxTexture_CreateFromNamedFile(filename.c_str(), KTX_TEXTURE_CREATE_LOAD_IMAGE_DATA_BIT, target);
#endif

View file

@ -1,10 +1,10 @@
/*
* Assorted commonly used Vulkan helper functions
*
* Copyright (C) 2016 by Sascha Willems - www.saschawillems.de
*
* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
*/
* Assorted commonly used Vulkan helper functions
*
* Copyright (C) 2016-2023 by Sascha Willems - www.saschawillems.de
*
* This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
*/
#include "VulkanTools.h"
@ -14,10 +14,24 @@ const std::string getAssetPath()
{
#if defined(VK_USE_PLATFORM_ANDROID_KHR)
return "";
#elif defined(VK_EXAMPLE_DATA_DIR)
return VK_EXAMPLE_DATA_DIR;
#elif defined(VK_EXAMPLE_ASSETS_DIR)
return VK_EXAMPLE_ASSETS_DIR;
#else
return "./../data/";
return "./../assets/";
#endif
}
#endif
#if !(defined(VK_USE_PLATFORM_IOS_MVK) || defined(VK_USE_PLATFORM_MACOS_MVK))
// iOS & macOS: VulkanExampleBase::getAssetPath() implemented externally to allow access to Objective-C components
const std::string getShaderBasePath()
{
#if defined(VK_USE_PLATFORM_ANDROID_KHR)
return "shaders/";
#elif defined(VK_EXAMPLE_SHADERS_DIR)
return VK_EXAMPLE_SHADERS_DIR;
#else
return "./../shaders/";
#endif
}
#endif

View file

@ -61,6 +61,7 @@
#endif
const std::string getAssetPath();
const std::string getShaderBasePath();
namespace vks
{

View file

@ -289,7 +289,7 @@ void vkglTF::Texture::fromglTfImage(tinygltf::Image &gltfimage, std::string path
#if defined(__ANDROID__)
AAsset* asset = AAssetManager_open(androidApp->activity->assetManager, filename.c_str(), AASSET_MODE_STREAMING);
if (!asset) {
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nThe file may be part of the additional asset pack.\n\nRun \"download_assets.py\" in the repository root to download the latest version.", -1);
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nMake sure the assets submodule has been checked out and is up-to-date.", -1);
}
size_t size = AAsset_getLength(asset);
assert(size > 0);
@ -300,7 +300,7 @@ void vkglTF::Texture::fromglTfImage(tinygltf::Image &gltfimage, std::string path
delete[] textureData;
#else
if (!vks::tools::fileExists(filename)) {
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nThe file may be part of the additional asset pack.\n\nRun \"download_assets.py\" in the repository root to download the latest version.", -1);
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nMake sure the assets submodule has been checked out and is up-to-date.", -1);
}
result = ktxTexture_CreateFromNamedFile(filename.c_str(), KTX_TEXTURE_CREATE_LOAD_IMAGE_DATA_BIT, &ktxTexture);
#endif

View file

@ -191,7 +191,7 @@ void VulkanExampleBase::destroyCommandBuffers()
std::string VulkanExampleBase::getShadersPath() const
{
return getAssetPath() + "shaders/" + shaderDir + "/";
return getShaderBasePath() + shaderDir + "/";
}
void VulkanExampleBase::createPipelineCache()

13
data/README.md vendored
View file

@ -1,13 +0,0 @@
# Getting the assets
Binary assets (models, textures, etc.) are not stored in this repository and need to be downloaded manually.
## Downloading the assets
### Option 1: Run the python script
Run the [download_assets.py](../download_assets.py) python script which will download the asset pack and unpacks it into the appropriate folder.
### Option 2: Manual download
Download the asset pack from [https://vulkan.gpuinfo.org/downloads/vulkan_asset_pack_gltf.zip](https://vulkan.gpuinfo.org/downloads/vulkan_asset_pack_gltf.zip) and extract it in the ```data``` directory.

View file

@ -1,31 +0,0 @@
#!/usr/bin/env python3
import sys
from urllib.request import urlretrieve
from zipfile import ZipFile
ASSET_PACK_URL = 'http://vulkan.gpuinfo.org/downloads/vulkan_asset_pack_gltf.zip'
ASSET_PACK_FILE_NAME = 'vulkan_asset_pack_gltf.zip'
print("Downloading asset pack from '%s'" % ASSET_PACK_URL)
def reporthook(blocknum, blocksize, totalsize):
bytesread = blocknum * blocksize
if totalsize > 0:
percent = bytesread * 1e2 / totalsize
s = "\r%5.1f%% (%*d / %d bytes)" % (percent, len(str(totalsize)), bytesread, totalsize)
sys.stderr.write(s)
if bytesread >= totalsize:
sys.stderr.write("\n")
else:
sys.stderr.write("read %d\n" % (bytesread,))
urlretrieve(ASSET_PACK_URL, ASSET_PACK_FILE_NAME, reporthook)
print("Download finished")
print("Extracting assets")
zip = ZipFile(ASSET_PACK_FILE_NAME, 'r')
zip.extractall("./")
zip.close()

View file

@ -513,7 +513,7 @@ public:
}
}
else {
vks::tools::exitFatal("Could not open the glTF file.\n\nThe file is part of the additional asset pack.\n\nRun \"download_assets.py\" in the repository root to download the latest version.", -1);
vks::tools::exitFatal("Could not open the glTF file.\n\nMake sure the assets submodule has been checked out and is up-to-date.", -1);
return;
}

View file

@ -383,7 +383,7 @@ void VulkanExample::loadglTFFile(std::string filename)
}
}
else {
vks::tools::exitFatal("Could not open the glTF file.\n\nThe file is part of the additional asset pack.\n\nRun \"download_assets.py\" in the repository root to download the latest version.", -1);
vks::tools::exitFatal("Could not open the glTF file.\n\nMake sure the assets submodule has been checked out and is up-to-date.", -1);
return;
}

View file

@ -754,7 +754,7 @@ void VulkanExample::loadglTFFile(std::string filename)
}
else
{
vks::tools::exitFatal("Could not open the glTF file.\n\nThe file is part of the additional asset pack.\n\nRun \"download_assets.py\" in the repository root to download the latest version.", -1);
vks::tools::exitFatal("Could not open the glTF file.\n\nMake sure the assets submodule has been checked out and is up-to-date.", -1);
return;
}

View file

@ -129,7 +129,7 @@ public:
// So they need to be loaded via the asset manager
AAsset* asset = AAssetManager_open(androidApp->activity->assetManager, filename.c_str(), AASSET_MODE_STREAMING);
if (!asset) {
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nThe file may be part of the additional asset pack.\n\nRun \"download_assets.py\" in the repository root to download the latest version.", -1);
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nMake sure the assets submodule has been checked out and is up-to-date.", -1);
}
size_t size = AAsset_getLength(asset);
assert(size > 0);
@ -141,7 +141,7 @@ public:
delete[] textureData;
#else
if (!vks::tools::fileExists(filename)) {
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nThe file may be part of the additional asset pack.\n\nRun \"download_assets.py\" in the repository root to download the latest version.", -1);
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nMake sure the assets submodule has been checked out and is up-to-date.", -1);
}
result = ktxTexture_CreateFromNamedFile(filename.c_str(), KTX_TEXTURE_CREATE_LOAD_IMAGE_DATA_BIT, &ktxTexture);
#endif

View file

@ -100,7 +100,7 @@ public:
// So they need to be loaded via the asset manager
AAsset* asset = AAssetManager_open(androidApp->activity->assetManager, filename.c_str(), AASSET_MODE_STREAMING);
if (!asset) {
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nThe file may be part of the additional asset pack.\n\nRun \"download_assets.py\" in the repository root to download the latest version.", -1);
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nMake sure the assets submodule has been checked out and is up-to-date.", -1);
}
size_t size = AAsset_getLength(asset);
assert(size > 0);
@ -112,7 +112,7 @@ public:
delete[] textureData;
#else
if (!vks::tools::fileExists(filename)) {
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nThe file may be part of the additional asset pack.\n\nRun \"download_assets.py\" in the repository root to download the latest version.", -1);
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nMake sure the assets submodule has been checked out and is up-to-date.", -1);
}
result = ktxTexture_CreateFromNamedFile(filename.c_str(), KTX_TEXTURE_CREATE_LOAD_IMAGE_DATA_BIT, &ktxTexture);
#endif

View file

@ -102,7 +102,7 @@ public:
// So they need to be loaded via the asset manager
AAsset* asset = AAssetManager_open(androidApp->activity->assetManager, filename.c_str(), AASSET_MODE_STREAMING);
if (!asset) {
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nThe file may be part of the additional asset pack.\n\nRun \"download_assets.py\" in the repository root to download the latest version.", -1);
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nMake sure the assets submodule has been checked out and is up-to-date.", -1);
}
size_t size = AAsset_getLength(asset);
assert(size > 0);
@ -114,7 +114,7 @@ public:
delete[] textureData;
#else
if (!vks::tools::fileExists(filename)) {
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nThe file may be part of the additional asset pack.\n\nRun \"download_assets.py\" in the repository root to download the latest version.", -1);
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nMake sure the assets submodule has been checked out and is up-to-date.", -1);
}
result = ktxTexture_CreateFromNamedFile(filename.c_str(), KTX_TEXTURE_CREATE_LOAD_IMAGE_DATA_BIT, &ktxTexture);
#endif

View file

@ -105,7 +105,7 @@ public:
// So they need to be loaded via the asset manager
AAsset* asset = AAssetManager_open(androidApp->activity->assetManager, filename.c_str(), AASSET_MODE_STREAMING);
if (!asset) {
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nThe file may be part of the additional asset pack.\n\nRun \"download_assets.py\" in the repository root to download the latest version.", -1);
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nMake sure the assets submodule has been checked out and is up-to-date.", -1);
}
size_t size = AAsset_getLength(asset);
assert(size > 0);
@ -117,7 +117,7 @@ public:
delete[] textureData;
#else
if (!vks::tools::fileExists(filename)) {
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nThe file may be part of the additional asset pack.\n\nRun \"download_assets.py\" in the repository root to download the latest version.", -1);
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nMake sure the assets submodule has been checked out and is up-to-date.", -1);
}
result = ktxTexture_CreateFromNamedFile(filename.c_str(), KTX_TEXTURE_CREATE_LOAD_IMAGE_DATA_BIT, &ktxTexture);
#endif

View file

@ -88,7 +88,7 @@ public:
// So they need to be loaded via the asset manager
AAsset* asset = AAssetManager_open(androidApp->activity->assetManager, filename.c_str(), AASSET_MODE_STREAMING);
if (!asset) {
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nThe file may be part of the additional asset pack.\n\nRun \"download_assets.py\" in the repository root to download the latest version.", -1);
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nMake sure the assets submodule has been checked out and is up-to-date.", -1);
}
size_t size = AAsset_getLength(asset);
assert(size > 0);
@ -100,7 +100,7 @@ public:
delete[] textureData;
#else
if (!vks::tools::fileExists(filename)) {
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nThe file may be part of the additional asset pack.\n\nRun \"download_assets.py\" in the repository root to download the latest version.", -1);
vks::tools::exitFatal("Could not load texture from " + filename + "\n\nMake sure the assets submodule has been checked out and is up-to-date.", -1);
}
result = ktxTexture_CreateFromNamedFile(filename.c_str(), KTX_TEXTURE_CREATE_LOAD_IMAGE_DATA_BIT, &ktxTexture);
#endif

View file

@ -257,7 +257,7 @@ void VulkanExample::loadglTFFile(std::string filename)
std::string path = filename.substr(0, pos);
if (!fileLoaded) {
vks::tools::exitFatal("Could not open the glTF file.\n\nThe file is part of the additional asset pack.\n\nRun \"download_assets.py\" in the repository root to download the latest version.", -1);
vks::tools::exitFatal("Could not open the glTF file.\n\nMake sure the assets submodule has been checked out and is up-to-date.", -1);
return;
}

Some files were not shown because too many files have changed in this diff Show more