Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added .idea/caches/build_file_checksums.ser
Binary file not shown.
Binary file added .idea/caches/gradle_models.ser
Binary file not shown.
116 changes: 116 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# MapMint4ME_GSoC2020

Added AR Simulation module in MapMint4ME:
* User can able to place to 3d object by selecting it from drop down menu
* Will able to adjust size of 3d object, rotate 3d object in real world scene
* Will able to accelerate 3d object in real world scene, left and right movement of 3d object in real world scene


64 changes: 57 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.ar.sceneform.plugin'

android {
compileSdkVersion 27
buildToolsVersion '28.0.3'

defaultConfig {
applicationId "fr.geolabs.dev.mapmint4me"
minSdkVersion 16
minSdkVersion 24
targetSdkVersion 27
versionCode 23
versionCode 22
versionName "1.0"
multiDexEnabled true
}
Expand All @@ -25,16 +27,64 @@ android {
// but continue the build even when errors are found:
abortOnError false
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
//implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support:design:26.1.0'
implementation 'com.android.support:support-compat:26.1.0'
//noinspection GradleCompatible
implementation 'com.android.support:appcompat-v7:27.1.0'
implementation 'com.android.support:design:27.1.0'
implementation 'com.android.support:support-compat:27.1.0'
api 'com.google.android.gms:play-services:12.0.1'
api 'com.google.android.gms:play-services-gcm:9.0.2'
api 'com.google.android.gms:play-services-gcm:10.2.1'
api 'com.google.android.gms:play-services-location:12.0.1'
api 'com.readystatesoftware.sqliteasset:sqliteassethelper:+'
//implementation 'com.android.support:leanback-v17:26.1.0'

implementation 'com.google.ar:core:1.8.0'
implementation 'com.google.ar.sceneform.ux:sceneform-ux:1.8.0'
implementation 'com.google.ar.sceneform:core:1.8.0'

implementation 'com.google.ar:core:1.0.0'
implementation 'javax.vecmath:vecmath:1.5.2'
implementation 'com.android.support:appcompat-v7:27.1.0'
implementation 'com.android.support:design:27.1.0'
implementation 'com.google.firebase:firebase-database:11.0.0'
implementation 'org.greenrobot:eventbus:3.1.1'
implementation 'com.android.support:preference-v7:27.0.0'
implementation 'com.android.support:preference-v14:27.0.0'


implementation 'de.javagl:obj:0.2.1'
implementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
transitive = true;
}


}


sceneform.asset('sampledata/model.obj',
'default',
'sampledata/model.sfa',
'src/main/assets/model')
sceneform.asset('sampledata/wheelchair.fbx',
'default',
'sampledata/wheelchair.sfa',
'src/main/assets/wheelchair')


sceneform.asset('sampledata/stroller.fbx',
'default',
'sampledata/stroller.sfa',
'src/main/assets/stroller')


sceneform.asset('sampledata/cart.fbx',
'default',
'sampledata/cart.sfa',
'src/main/assets/cart')
48 changes: 48 additions & 0 deletions app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"project_info": {
"project_number": "330195530896",
"firebase_url": "https://mapmint4meo.firebaseio.com",
"project_id": "mapmint4meo",
"storage_bucket": "mapmint4meo.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:330195530896:android:7b763fa19e5f1685",
"android_client_info": {
"package_name": "fr.geolabs.dev.mapmint4me"
}
},
"oauth_client": [
{
"client_id": "330195530896-a960pga83drjqsmd1p5n0l84pradsa1l.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "fr.geolabs.dev.mapmint4me",
"certificate_hash": "ff2b0d70f42941f42a93c27e07470d25cbca0587"
}
},
{
"client_id": "330195530896-3k58vvvf50j35dvqba4n9o9nag25ej56.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCq3VvJ7SEZUgut7y9_btAWI9G8qSUNRxs"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "330195530896-3k58vvvf50j35dvqba4n9o9nag25ej56.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}
7 changes: 7 additions & 0 deletions app/sampledata/Andy.mtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
newmtl initialShadingGroup
illum 4
Kd 0.00 0.00 0.00
Ka 0.00 0.00 0.00
Tf 1.00 1.00 1.00
map_Kd Andy_Diffuse.png
Ni 1.00
Loading