Skip to content

Commit 6718175

Browse files
IO 2019 Updates (#8)
* Changes for IO 2019 * Removed precompiled Sceneform asset * Modified gitignore to include sfb files
1 parent 9c3b40e commit 6718175

File tree

200 files changed

+2963
-26968
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+2963
-26968
lines changed

part-1/.gitignore renamed to .gitignore

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,15 @@ local.properties
1111

1212
# OS configurations.
1313
.DS_Store
14+
15+
# Other Build Artifacts
16+
helpers/build/
17+
part1/build/
18+
part2/build/
19+
part3/build/
20+
part4/build/
21+
work/build/
22+
23+
# Compiled Sceneform Assets
24+
*.sfb
25+
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.0.1'
9+
classpath 'com.android.tools.build:gradle:3.3.0'
10+
classpath 'com.google.ar.sceneform:plugin:1.8.0'
11+
classpath 'com.google.gms:google-services:4.2.0'
1012
// NOTE: Do not place your application dependencies here; they belong
1113
// in the individual module build.gradle files
1214
}

gradle/wrapper/gradle-wrapper.jar

53.9 KB
Binary file not shown.

part-1/gradle/wrapper/gradle-wrapper.properties renamed to gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

part-3/gradlew renamed to gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

part-3/gradlew.bat renamed to gradlew.bat

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

helpers/build.gradle

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
apply plugin: 'com.android.library'
2+
3+
android {
4+
compileSdkVersion 28
5+
defaultConfig {
6+
minSdkVersion 26
7+
targetSdkVersion 28
8+
versionCode 1
9+
versionName "1.0"
10+
}
11+
compileOptions {
12+
sourceCompatibility JavaVersion.VERSION_1_8
13+
targetCompatibility JavaVersion.VERSION_1_8
14+
}
15+
buildTypes {
16+
release {
17+
minifyEnabled false
18+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
19+
}
20+
}
21+
}
22+
23+
dependencies {
24+
// ARCore Library
25+
implementation 'com.google.ar:core:1.8.0'
26+
27+
// Android Support Library
28+
implementation 'com.android.support:appcompat-v7:28.0.0'
29+
implementation 'com.android.support:design:28.0.0'
30+
implementation 'com.google.firebase:firebase-database:16.1.0'
31+
}
32+
33+
task compileUxAssets {
34+
}
35+
36+
preBuild.dependsOn compileUxAssets
37+
38+
apply plugin: 'com.google.ar.sceneform.plugin'
39+
40+
sceneform.asset('models/andy.obj',
41+
'default',
42+
'models/andy.sfa',
43+
'src/main/res/raw/andy')
44+
45+
sceneform.before('compileUxAssets')

helpers/models/andy.mtl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
newmtl unlit_material
2+
illum 2
3+
Kd 0.00 0.00 0.00
4+
Ka 0.00 0.00 0.00
5+
Tf 1.00 1.00 1.00
6+
map_Kd andy.png
7+
Ni 1.00

0 commit comments

Comments
 (0)