Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mesh formats and shader adaptation tests #232

Merged
merged 23 commits into from
Feb 15, 2018
Merged

Mesh formats and shader adaptation tests #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f6b7f58
Fix project path at gradle
ragner Jan 17, 2018
7c0b3af
add joml library to utils
ragner Jan 19, 2018
14eeb11
Add base classes to parse json
eliamara Jan 29, 2018
e16ee4e
Parse json array to array of int or float
ragner Jan 29, 2018
c3c972c
Parse json to crate bitmap texture
ragner Jan 29, 2018
c14f256
Parse json to create textures
ragner Jan 29, 2018
7ea469f
Parse json to crate color
eliamara Jan 29, 2018
f95de54
Parse json to create material
ragner Jan 29, 2018
70319b4
Parse json to create transform
eliamara Jan 29, 2018
2cc947b
Parse json to create lights
eliamara Jan 29, 2018
196c244
Parse json to create geometries
ragner Jan 29, 2018
988c593
Parse json to create scene objects
ragner Jan 29, 2018
3483e08
Parse json to add lights to scene
eliamara Jan 29, 2018
930e872
Parse json to create the scene
crbozz Jan 29, 2018
8532497
Test mesh formats and shader combinations
ragner Jan 29, 2018
59ea02a
Test mesh starts without texture
eliamara Jan 29, 2018
0dd2b1d
Test mesh starts with textures
eliamara Jan 29, 2018
24424d1
Test mesh without lighting
Jan 29, 2018
66bdebd
Test mesh with lighting
Jan 29, 2018
0351834
Test mesh with lighting and lighting disabled
Jan 29, 2018
82f05bc
Test mesh change of texcoords
Jan 30, 2018
37be9dd
Doc to describe a GVRScene in JSON format
ragner Jan 30, 2018
85ef188
Parse json to renderdata
ragner Feb 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions asset-tests/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ android {

applicationVariants.all { variant ->
variant.outputs.all { output ->
output.outputFileName = output.outputFile.parent +
rootProject.name + ".apk"
output.outputFileName = rootProject.name + ".apk"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions framework-tests/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ android {

applicationVariants.all { variant ->
variant.outputs.all { output ->
output.outputFileName = output.outputFile.parent +
rootProject.name + ".apk"
output.outputFileName = rootProject.name + ".apk"
}
}

Expand Down
Loading