claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fallback to non-compressed format (Refs #174)

Browse source
This commit is contained in:
saschawillems 2017-03-17 20:36:23 +01:00
parent 33ead48da0
commit bdd3678859
3 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
android/hdr/AndroidManifest.xml
View file

@ -15,6 +15,7 @@
android:label="High dynamic range" android:label="High dynamic range"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:launchMode="singleTask" android:launchMode="singleTask"
android:screenOrientation="landscape"
android:configChanges="orientation|screenSize|keyboardHidden"> android:configChanges="orientation|screenSize|keyboardHidden">
<meta-data android:name="android.app.lib_name" android:value="vulkanHDR" /> <meta-data android:name="android.app.lib_name" android:value="vulkanHDR" />
<intent-filter> <intent-filter>

23
android/hdr/build.py
View file

@ -7,45 +7,38 @@ import glob
APK_NAME = "vulkanHDR" APK_NAME = "vulkanHDR"
SHADER_DIR = "hdr" SHADER_DIR = "hdr"
ASSETS_MODELS = ["cube.obj", "sphere.obj", "teapot.dae", "torusknot.obj"] ASSETS_MODELS = ["cube.obj", "sphere.obj", "teapot.dae", "torusknot.obj"]
ASSETS_TEXTURES = ["hdr_uffizi_bc6uf.DDS"] ASSETS_TEXTURES = ["hdr_uffizi_bc6uf.DDS", "hrd_uffizi_rgba16_float.dds"]
if subprocess.call("ndk-build", shell=True) == 0: if subprocess.call("ndk-build", shell=True) == 0:
print("Build successful") print("Build successful")
# Assets # Assets
if not os.path.exists("./assets"): os.makedirs("./assets/shaders/base", exist_ok=True)
os.makedirs("./assets") os.makedirs("./assets/shaders/%s" % SHADER_DIR, exist_ok=True)
os.makedirs("./assets/textures", exist_ok=True)
os.makedirs("./assets/models", exist_ok=True)
os.makedirs("./res/drawable", exist_ok=True)
# Shaders # Shaders
# Base # Base
if not os.path.exists("./assets/shaders/base"):
os.makedirs("./assets/shaders/base")
for file in glob.glob("../../data/shaders/base/*.spv"): for file in glob.glob("../../data/shaders/base/*.spv"):
shutil.copy(file, "./assets/shaders/base") shutil.copy(file, "./assets/shaders/base")
# Sample # Sample
if not os.path.exists("./assets/shaders/%s" % SHADER_DIR):
os.makedirs("./assets/shaders/%s" % SHADER_DIR)
for file in glob.glob("../../data/shaders/%s/*.spv" %SHADER_DIR): for file in glob.glob("../../data/shaders/%s/*.spv" %SHADER_DIR):
shutil.copy(file, "./assets/shaders/%s" % SHADER_DIR) shutil.copy(file, "./assets/shaders/%s" % SHADER_DIR)
# Textures # Textures
if not os.path.exists("./assets/textures"):
os.makedirs("./assets/textures")
for file in ASSETS_TEXTURES: for file in ASSETS_TEXTURES:
shutil.copy("../../data/textures/%s" % file, "./assets/textures") shutil.copy("../../data/textures/%s" % file, "./assets/textures")
# Models # Models
if not os.path.exists("./assets/models"):
os.makedirs("./assets/models")
for file in ASSETS_MODELS: for file in ASSETS_MODELS:
shutil.copy("../../data/models/%s" % file, "./assets/models") shutil.copy("../../data/models/%s" % file, "./assets/models")
# Icon # Icon
if not os.path.exists("./res/drawable"):
os.makedirs("./res/drawable")
shutil.copy("../../android/images/icon.png", "./res/drawable") shutil.copy("../../android/images/icon.png", "./res/drawable")
if subprocess.call("ant debug -Dout.final.file=%s.apk" % APK_NAME, shell=True) == 0: if subprocess.call("ant debug -Dout.final.file=%s.apk" % APK_NAME, shell=True) == 0:
if len(sys.argv) > 1: for arg in sys.argv[1:]:
if sys.argv[1] == "-deploy": if arg == "-deploy":
if subprocess.call("adb install -r %s.apk" % APK_NAME, shell=True) != 0: if subprocess.call("adb install -r %s.apk" % APK_NAME, shell=True) != 0:
print("Could not deploy to device!") print("Could not deploy to device!")
else: else:

9
hdr/hdr.cpp
View file

@ -610,7 +610,14 @@ public:
// Load HDR texture (equirectangular projected) // Load HDR texture (equirectangular projected)
// VK_FORMAT_BC6H_UFLOAT_BLOCK is a compressed 16 bit unsigned floating point format for storing HDR content // VK_FORMAT_BC6H_UFLOAT_BLOCK is a compressed 16 bit unsigned floating point format for storing HDR content
textures.envmap.loadFromFile(getAssetPath() + "textures/hdr_uffizi_bc6uf.DDS", VK_FORMAT_BC6H_UFLOAT_BLOCK, vulkanDevice, queue); if (deviceFeatures.textureCompressionBC)
{
textures.envmap.loadFromFile(getAssetPath() + "textures/hdr_uffizi_bc6uf.DDS", VK_FORMAT_BC6H_UFLOAT_BLOCK, vulkanDevice, queue);
}
else
{
textures.envmap.loadFromFile(getAssetPath() + "textures/hrd_uffizi_rgba16_float.dds", VK_FORMAT_R16G16B16A16_SFLOAT, vulkanDevice, queue);
}
// Custom sampler with clamping adress mode // Custom sampler with clamping adress mode
vkDestroySampler(device, textures.envmap.sampler, nullptr); vkDestroySampler(device, textures.envmap.sampler, nullptr);