Commit 5c9fbcff authored by Florian Oetke's avatar Florian Oetke
Browse files

Merge branch 'feature/texture_compression' into 'develop'

texture compression (fixes #40)

Closes #40

See merge request lowkey42/mirrage!13
parents 37a21837 b2a22d81
......@@ -40,3 +40,6 @@
[submodule "dependencies/SDL"]
path = dependencies/SDL
url = https://github.com/SDL-mirror/SDL.git
[submodule "dependencies/crunch"]
path = dependencies/crunch
url = https://github.com/lowkey42/crunch.git
......@@ -29,6 +29,7 @@ Required:
Included in this repository:
- Assimp 3.3.1 (only for mesh-converter)
- crunch (only for mesh-converter): "Crunch Library Copyright (c) 2010-2016 Richard Geldreich, Jr., Tenacious Software, and Binomial LLC"
- glm
- gsl
- moodycamel
......
{
"substance_id": "emissive",
"albedo_aid": "cube_light.ktx"
"substance_id": "default",
"albedo_aid": "cube_light.ktx",
"emission_aid": "default_white.ktx"
}
{
"substance_id": "default",
"albedo_aid": "cornell_floor_albedo.ktx",
"mat_data_aid": "cornell_floor_mat_data.ktx"
"normal_aid": "cornell_floor_normal.ktx",
"brdf_aid": "cornell_floor_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "cornell_leftWall_albedo.ktx",
"mat_data_aid": "cornell_leftWall_mat_data.ktx"
}
{
"substance_id": "default",
"albedo_aid": "cornell_leftwall_albedo.ktx",
"normal_aid": "cornell_leftwall_normal.ktx",
"brdf_aid": "cornell_leftwall_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "emissive",
"substance_id": "alphatest",
"albedo_aid": "cornell_light_albedo.ktx",
"mat_data2_aid": "cornell_light_mat_data2.ktx"
"normal_aid": "cornell_light_normal.ktx",
"brdf_aid": "cornell_light_brdf.ktx",
"emission_aid": "cornell_light_emission.ktx"
}
{
"substance_id": "default",
"albedo_aid": "cornell_rightWall_albedo.ktx",
"mat_data_aid": "cornell_rightWall_mat_data.ktx"
}
{
"substance_id": "default",
"albedo_aid": "cornell_rightwall_albedo.ktx",
"normal_aid": "cornell_rightwall_normal.ktx",
"brdf_aid": "cornell_rightwall_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "cornell_shortBox_albedo.ktx",
"mat_data_aid": "cornell_shortBox_mat_data.ktx"
}
{
"substance_id": "default",
"albedo_aid": "cornell_shortbox_albedo.ktx",
"normal_aid": "cornell_shortbox_normal.ktx",
"brdf_aid": "cornell_shortbox_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "cornell_sphere_albedo.ktx",
"mat_data_aid": "cornell_sphere_mat_data.ktx"
"normal_aid": "cornell_sphere_normal.ktx",
"brdf_aid": "cornell_sphere_brdf.ktx",
"emission_aid": ""
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment