Skip to content

Commit

Permalink
Clean up rajaVrDemo dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
kanawish committed Aug 1, 2016
1 parent 79605ba commit 49670d0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 29 deletions.
27 changes: 0 additions & 27 deletions rajaVrDemo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,31 +58,4 @@ dependencies {
compile 'org.rajawali3d:rajawali:1.0.325@aar'
// compile 'org.rajawali3d:rajawali:1.1.517-SNAPSHOT@aar'

// NOTE: Below are a typical list of dependencies found in medium/large projects:

// Timber Logging API: Better method signatures, easy log-level-by-flavor management, decent lint checks, etc.
// https://github.com/JakeWharton/timber
compile 'com.jakewharton.timber:timber:4.1.2'

// RxJava
compile "io.reactivex:rxjava:$project.rxJavaVersion"
// Android Extensions - https://github.com/ReactiveX/RxAndroid/wiki
compile "io.reactivex:rxandroid:$project.rxAndroidVersion"
compile "com.jakewharton.rxrelay:rxrelay:1.1.0"
compile "com.jakewharton.rxbinding:rxbinding:$project.rxBindingVersion"
compile "com.jakewharton.rxbinding:rxbinding-support-v4:$project.rxBindingVersion"
compile "com.jakewharton.rxbinding:rxbinding-appcompat-v7:$project.rxBindingVersion"
// compile 'com.jakewharton.rxbinding:rxbinding-design:0.4.0'
// compile 'com.jakewharton.rxbinding:rxbinding-recyclerview-v7:0.4.0'

// Square Networking
compile "com.squareup.okhttp3:okhttp:$project.okhttpVersion"
compile "com.squareup.okhttp3:logging-interceptor:$project.okhttpVersion"
compile "com.squareup.okhttp3:okhttp-urlconnection:$project.okhttpVersion"
// compile "com.squareup.picasso:picasso:$project.picassoVersion"
compile "com.jakewharton.picasso:picasso2-okhttp3-downloader:$project.picassoOkHttpDownloaderVersion"
compile "com.squareup.retrofit2:retrofit:$project.retrofitVersion"
compile "com.squareup.retrofit2:adapter-rxjava:$project.retrofitVersion"
compile "com.squareup.retrofit2:converter-gson:$project.retrofitVersion"

}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import android.content.Context;
import android.graphics.Color;
import android.support.annotation.NonNull;
import android.view.MotionEvent;

import org.rajawali3d.Object3D;
import org.rajawali3d.animation.Animation;
Expand All @@ -23,7 +24,7 @@

public final class DemoVRRenderer extends RajaStereoRenderer {

private DirectionalLight mDirectionalLight;
private DirectionalLight directionalLight;

public DemoVRRenderer(Context context) {
super(context);
Expand Down Expand Up @@ -75,7 +76,7 @@ public void initScene() {

private Object3D buildOBJ() {
Object3D o;
LoaderOBJ objParser = new LoaderOBJ(mContext.getResources(), mTextureManager, R.raw.demo_1_obj);
LoaderOBJ objParser = new LoaderOBJ(mContext.getResources(), getTextureManager(), R.raw.demo_1_obj);
try {
objParser.parse();
} catch (ParsingException e) {
Expand Down Expand Up @@ -136,4 +137,8 @@ private Material buildTextureMaterial(int color) {
return material;
}

@Override
public void onTouchEvent(MotionEvent event) {
// Nothing to do.
}
}

0 comments on commit 49670d0

Please sign in to comment.