Merge pull request #20 from UncorkedStudios/master

Fix for long display aspect ratios.
googlecreativelab · Nov 19, 2018 · 48858bd · 48858bd
2 parents 057ce8f + 5ce663a
commit 48858bd
Show file tree

Hide file tree

Showing 12 changed files with 124 additions and 105 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/build.gradle b/build.gradle
@@ -2,9 +2,9 @@
 
 buildscript {
     repositories {
+        google()
         maven { url "http://jcenter.bintray.com"}
         jcenter()
-        google()
         mavenCentral()
     }
     dependencies {
@@ -16,8 +16,8 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         maven { url "http://jcenter.bintray.com"}
         jcenter()
-        google()
     }
 }
diff --git a/shadercam-example/build.gradle b/shadercam-example/build.gradle
@@ -25,10 +25,11 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0' //for theming
 
     implementation project(':shadercam')
     implementation 'com.uncorkedstudios.android:recordable-surfaceview:1.5.0'
-    implementation 'com.android.support:appcompat-v7:28.0.0' //for theming
     annotationProcessor 'com.jakewharton:butterknife:7.0.1'
     implementation 'com.jakewharton:butterknife:7.0.1' //dependency injection
 }
diff --git a/shadercam-example/shadercam-example.iml b/shadercam-example/shadercam-example.iml
@@ -84,22 +84,31 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkReleaseClasspath" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
@@ -124,9 +133,11 @@
     <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-1.1.1" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable-28.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.1" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:print-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:loader-28.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-v4-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:viewpager-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-fragment-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0@jar" level="project" />

diff --git a/shadercam-example/src/main/assets/touchcolor.vert.glsl b/shadercam-example/src/main/assets/touchcolor.vert.glsl
@@ -3,6 +3,8 @@ attribute vec4 position;
 
 //camera transform and texture
 uniform mat4 camTextureTransform;
+uniform mat4 uPMatrix;
+
 attribute vec4 camTexCoordinate;
 
 //tex coords
@@ -12,5 +14,5 @@ void main()
 {
     //camera texcoord needs to be manipulated by the transform given back from the system
     v_CamTexCoordinate = (camTextureTransform * camTexCoordinate).xy;
-    gl_Position = position;
+    gl_Position =  uPMatrix * position;
 }
diff --git a/...rcam-example/src/main/java/com/androidexperiments/shadercam/example/MeetupActivityV2.java b/...rcam-example/src/main/java/com/androidexperiments/shadercam/example/MeetupActivityV2.java
@@ -21,8 +21,8 @@ public class MeetupActivityV2 extends SimpleRSVShaderActivity implements SeekBar
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 //        mVideoRenderer = new VideoRenderer(this);
-//        mVideoRenderer = new TestRenderer(this);
-        mVideoRenderer = new ExampleVideoRenderer(this);
+        mVideoRenderer = new TestRenderer(this);
+//        mVideoRenderer = new ExampleVideoRenderer(this);
         mSeekbar = (SeekBar) findViewById(R.id.seek_bar);
         mSeekbar.setOnSeekBarChangeListener(this);
     }

diff --git a/...ample/src/main/java/com/androidexperiments/shadercam/example/SimpleRSVShaderActivity.java b/...ample/src/main/java/com/androidexperiments/shadercam/example/SimpleRSVShaderActivity.java
@@ -184,7 +184,9 @@ protected void onResume() {
             if (!mPermissionsHelper.checkPermissions()) {
                 return;
             } else {
-                mVideoRenderer = new VideoRenderer(this);
+                if (mVideoRenderer == null) {
+                    mVideoRenderer = new VideoRenderer(this);
+                }
                 setupVideoFragment(mVideoRenderer);
                 mRecordableSurfaceView.resume();
 

diff --git a/shadercam-example/src/main/res/values-v28/styles.xml b/shadercam-example/src/main/res/values-v28/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+            <item name="android:windowLayoutInDisplayCutoutMode">
+                shortEdges
+            </item>
+    </style>
+
+</resources>
diff --git a/shadercam/shadercam-shadercam.iml b/shadercam/shadercam-shadercam.iml
@@ -86,16 +86,29 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/aapt_friendly_merged_manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_typedef_file" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_zip" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_and_local_jars_jni" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/shadercam/src/main/assets/vid.vert.glsl b/shadercam/src/main/assets/vid.vert.glsl
@@ -3,7 +3,7 @@ attribute vec4 position;
 
 //camera transform and texture
 uniform mat4 camTextureTransform;
-uniform mat4 uMVPMatrix;
+uniform mat4 uPMatrix;
 
 attribute vec4 camTexCoordinate;
 
@@ -14,5 +14,5 @@ void main()
 {
     //camera texcoord needs to be manipulated by the transform given back from the system
     v_CamTexCoordinate = (camTextureTransform * camTexCoordinate).xy;
-    gl_Position =  position;
+    gl_Position =  uPMatrix * position;
 }