added width comparison for re-initializing bitmap variables

IanPhilips · Dec 5, 2018 · 80997aa · 80997aa
1 parent 34f0354
commit 80997aa
Show file tree

Hide file tree

Showing 50 changed files with 8 additions and 9 deletions.
diff --git a/AndroidViewToGLRendering-master/.gradle/4.4/fileHashes/fileHashes.bin b/AndroidViewToGLRendering-master/.gradle/4.4/fileHashes/fileHashes.bin
diff --git a/AndroidViewToGLRendering-master/.gradle/4.4/fileHashes/fileHashes.lock b/AndroidViewToGLRendering-master/.gradle/4.4/fileHashes/fileHashes.lock
diff --git a/AndroidViewToGLRendering-master/.gradle/4.4/javaCompile/classAnalysis.bin b/AndroidViewToGLRendering-master/.gradle/4.4/javaCompile/classAnalysis.bin
diff --git a/AndroidViewToGLRendering-master/.gradle/4.4/javaCompile/javaCompile.lock b/AndroidViewToGLRendering-master/.gradle/4.4/javaCompile/javaCompile.lock
diff --git a/AndroidViewToGLRendering-master/.gradle/4.4/taskHistory/taskHistory.bin b/AndroidViewToGLRendering-master/.gradle/4.4/taskHistory/taskHistory.bin
diff --git a/AndroidViewToGLRendering-master/.gradle/4.4/taskHistory/taskHistory.lock b/AndroidViewToGLRendering-master/.gradle/4.4/taskHistory/taskHistory.lock
diff --git a/AndroidViewToGLRendering-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/AndroidViewToGLRendering-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/AndroidViewToGLRendering-master/.gradle/workspace-id.txt.lock b/AndroidViewToGLRendering-master/.gradle/workspace-id.txt.lock
diff --git a/AndroidViewToGLRendering-master/classes/classes.iml b/AndroidViewToGLRendering-master/classes/classes.iml
@@ -21,5 +21,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="classes.classes" level="project" />
   </component>
 </module>
diff --git a/AndroidViewToGLRendering-master/unitylibrary/build/.DS_Store b/AndroidViewToGLRendering-master/unitylibrary/build/.DS_Store
diff --git a/AndroidViewToGLRendering-master/unitylibrary/build/generated/.DS_Store b/AndroidViewToGLRendering-master/unitylibrary/build/generated/.DS_Store
diff --git a/AndroidViewToGLRendering-master/unitylibrary/build/generated/assets/.DS_Store b/AndroidViewToGLRendering-master/unitylibrary/build/generated/assets/.DS_Store
diff --git a/...tylibrary/build/intermediates/classes/debug/com/unityexport/ian/unitylibrary/MainGL.class b/...tylibrary/build/intermediates/classes/debug/com/unityexport/ian/unitylibrary/MainGL.class
diff --git a/...library/build/intermediates/classes/release/com/unityexport/ian/unitylibrary/MainGL.class b/...library/build/intermediates/classes/release/com/unityexport/ian/unitylibrary/MainGL.class
diff --git a/...library/build/intermediates/incremental/mergeReleaseResources/compile-file-map.properties b/...library/build/intermediates/incremental/mergeReleaseResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Tue Dec 04 11:58:22 MST 2018
+#Wed Dec 05 07:38:59 MST 2018
 /Users/iansp/.gradle/caches/transforms-1/files-1.1/appcompat-v7-25.4.0.aar/2fcc4656a83e4bd7f2fb3323d0ea150a/res/drawable-xxhdpi-v4/abc_btn_switch_to_on_mtrl_00001.9.png=/Users/iansp/Documents/BlueAlloy/Android/UnityAndroidVRBrowser/AndroidViewToGLRendering-master/unitylibrary/build/intermediates/res/merged/release/drawable-xxhdpi-v4/abc_btn_switch_to_on_mtrl_00001.9.png
 /Users/iansp/.gradle/caches/transforms-1/files-1.1/appcompat-v7-25.4.0.aar/2fcc4656a83e4bd7f2fb3323d0ea150a/res/drawable-xxxhdpi-v4/abc_ic_menu_selectall_mtrl_alpha.png=/Users/iansp/Documents/BlueAlloy/Android/UnityAndroidVRBrowser/AndroidViewToGLRendering-master/unitylibrary/build/intermediates/res/merged/release/drawable-xxxhdpi-v4/abc_ic_menu_selectall_mtrl_alpha.png
 /Users/iansp/.gradle/caches/transforms-1/files-1.1/appcompat-v7-25.4.0.aar/2fcc4656a83e4bd7f2fb3323d0ea150a/res/drawable/abc_ic_arrow_drop_right_black_24dp.xml=/Users/iansp/Documents/BlueAlloy/Android/UnityAndroidVRBrowser/AndroidViewToGLRendering-master/unitylibrary/build/intermediates/res/merged/release/drawable/abc_ic_arrow_drop_right_black_24dp.xml

diff --git a/...library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/...library/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Sat Dec 01 09:19:29 MST 2018
+#Wed Dec 05 07:38:55 MST 2018
 /Users/iansp/Documents/BlueAlloy/Android/UnityAndroidVRBrowser/AndroidViewToGLRendering-master/unitylibrary/src/main/res/layout/extralayouts.xml=/Users/iansp/Documents/BlueAlloy/Android/UnityAndroidVRBrowser/AndroidViewToGLRendering-master/unitylibrary/build/intermediates/packaged_res/debug/layout/extralayouts.xml
 /Users/iansp/Documents/BlueAlloy/Android/UnityAndroidVRBrowser/AndroidViewToGLRendering-master/unitylibrary/src/main/res/raw/per_pixel_vertex_shader.glsl=/Users/iansp/Documents/BlueAlloy/Android/UnityAndroidVRBrowser/AndroidViewToGLRendering-master/unitylibrary/build/intermediates/packaged_res/debug/raw/per_pixel_vertex_shader.glsl
 /Users/iansp/Documents/BlueAlloy/Android/UnityAndroidVRBrowser/AndroidViewToGLRendering-master/unitylibrary/src/main/res/raw/point_vertex_shader.glsl=/Users/iansp/Documents/BlueAlloy/Android/UnityAndroidVRBrowser/AndroidViewToGLRendering-master/unitylibrary/build/intermediates/packaged_res/debug/raw/point_vertex_shader.glsl

diff --git a/...brary/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/...brary/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Tue Dec 04 11:58:19 MST 2018
+#Wed Dec 05 07:38:56 MST 2018
 /Users/iansp/Documents/BlueAlloy/Android/UnityAndroidVRBrowser/AndroidViewToGLRendering-master/unitylibrary/src/main/res/layout/extralayouts.xml=/Users/iansp/Documents/BlueAlloy/Android/UnityAndroidVRBrowser/AndroidViewToGLRendering-master/unitylibrary/build/intermediates/packaged_res/release/layout/extralayouts.xml
 /Users/iansp/Documents/BlueAlloy/Android/UnityAndroidVRBrowser/AndroidViewToGLRendering-master/unitylibrary/src/main/res/raw/per_pixel_vertex_shader.glsl=/Users/iansp/Documents/BlueAlloy/Android/UnityAndroidVRBrowser/AndroidViewToGLRendering-master/unitylibrary/build/intermediates/packaged_res/release/raw/per_pixel_vertex_shader.glsl
 /Users/iansp/Documents/BlueAlloy/Android/UnityAndroidVRBrowser/AndroidViewToGLRendering-master/unitylibrary/src/main/res/raw/point_vertex_shader.glsl=/Users/iansp/Documents/BlueAlloy/Android/UnityAndroidVRBrowser/AndroidViewToGLRendering-master/unitylibrary/build/intermediates/packaged_res/release/raw/point_vertex_shader.glsl

diff --git a/...ToGLRendering-master/unitylibrary/build/intermediates/intermediate-jars/debug/classes.jar b/...ToGLRendering-master/unitylibrary/build/intermediates/intermediate-jars/debug/classes.jar
diff --git a/...GLRendering-master/unitylibrary/build/intermediates/intermediate-jars/release/classes.jar b/...GLRendering-master/unitylibrary/build/intermediates/intermediate-jars/release/classes.jar
diff --git a/...wToGLRendering-master/unitylibrary/build/intermediates/packaged-classes/debug/classes.jar b/...wToGLRendering-master/unitylibrary/build/intermediates/packaged-classes/debug/classes.jar
diff --git a/...oGLRendering-master/unitylibrary/build/intermediates/packaged-classes/release/classes.jar b/...oGLRendering-master/unitylibrary/build/intermediates/packaged-classes/release/classes.jar
diff --git a/AndroidViewToGLRendering-master/unitylibrary/build/outputs/aar/unitylibrary-debug.aar b/AndroidViewToGLRendering-master/unitylibrary/build/outputs/aar/unitylibrary-debug.aar
diff --git a/AndroidViewToGLRendering-master/unitylibrary/build/outputs/aar/unitylibrary-release.aar b/AndroidViewToGLRendering-master/unitylibrary/build/outputs/aar/unitylibrary-release.aar
diff --git a/AndroidViewToGLRendering-master/unitylibrary/build/reports/lint-results.html b/AndroidViewToGLRendering-master/unitylibrary/build/reports/lint-results.html
@@ -176,7 +176,7 @@
       <span class="mdl-layout-title">Lint Report: 11 warnings</span>
       <div class="mdl-layout-spacer"></div>
       <nav class="mdl-navigation mdl-layout--large-screen-only">
-Check performed at Tue Dec 04 13:11:27 MST 2018      </nav>
+Check performed at Wed Dec 05 12:05:51 MST 2018      </nav>
     </div>
   </header>
   <div class="mdl-layout__drawer">

diff --git a/...LRendering-master/unitylibrary/src/main/java/com/unityexport/ian/unitylibrary/MainGL.java b/...LRendering-master/unitylibrary/src/main/java/com/unityexport/ian/unitylibrary/MainGL.java
@@ -272,7 +272,7 @@ public void convertWebviewToBitmapForUnity(){
             initViews(mView);
         }
 
-        if (bm.getHeight() != outputWindowHeight)
+        if (bm.getHeight() != outputWindowHeight || bm.getWidth() != outputWindowWidth)
             initBitmapStuff();
 
         bm.compress(Bitmap.CompressFormat.PNG, 100, stream);

diff --git a/UnityProject/Library/EditorInstance.json b/UnityProject/Library/EditorInstance.json
@@ -1,5 +1,5 @@
 {
-	"process_id" : 12863,
+	"process_id" : 1527,
 	"version" : "2018.3.0b2",
 	"app_path" : "/Applications/Unity/Hub/Editor/2018.3.0b2/Unity.app",
 	"app_contents_path" : "/Applications/Unity/Hub/Editor/2018.3.0b2/Unity.app/Contents"

diff --git a/UnityProject/Library/LastBuild.buildreport b/UnityProject/Library/LastBuild.buildreport
diff --git a/UnityProject/Library/PlayerDataCache/Android/Data/Managed/Assembly-CSharp.dll b/UnityProject/Library/PlayerDataCache/Android/Data/Managed/Assembly-CSharp.dll
diff --git a/UnityProject/Library/PlayerDataCache/Android/Data/Managed/Unity.TextMeshPro.dll b/UnityProject/Library/PlayerDataCache/Android/Data/Managed/Unity.TextMeshPro.dll
diff --git a/UnityProject/Library/PlayerDataCache/Android/Data/globalgamemanagers b/UnityProject/Library/PlayerDataCache/Android/Data/globalgamemanagers
diff --git a/UnityProject/Library/PlayerDataCache/Android/Data/globalgamemanagers.assets b/UnityProject/Library/PlayerDataCache/Android/Data/globalgamemanagers.assets
diff --git a/UnityProject/Library/PlayerDataCache/Android/ScriptLayoutHashes.txt b/UnityProject/Library/PlayerDataCache/Android/ScriptLayoutHashes.txt
@@ -59,8 +59,6 @@ abf1930d8126d0b2e00e9449129a0190 UnityEngine.UI.dll:UnityEngine.EventSystems.Tou
 64e54c0cbb0177c5ea26f340efb9ff85 UnityEngine.UI.dll:UnityEngine.UI.VerticalLayoutGroup
 b3bb7c40cede9849e7814d6093dcfcea Assembly-CSharp.dll:.OVRRaycaster
 98ad81e9f689a492509f07e75b810aaa Unity.TextMeshPro.dll:TMPro.TMP_InputField
-71bb6a6b6c8f052f948db64c7dd3ca4f UnityEngine.Advertisements.dll:UnityEngine.Advertisements.CallbackExecutor
-71bb6a6b6c8f052f948db64c7dd3ca4f UnityEngine.Advertisements.dll:UnityEngine.Advertisements.Editor.Placeholder
 cf9f5cf2c3145a37ac07f00e50e460f9 UnityEngine.UI.dll:UnityEngine.UI.AspectRatioFitter
 71bb6a6b6c8f052f948db64c7dd3ca4f UnityEngine.UI.dll:UnityEngine.EventSystems.BaseInput
 5fc094978ce3e3591a7500ed380d854a UnityEngine.UI.dll:UnityEngine.UI.Button

diff --git a/UnityProject/Library/ProtocolInstance.json b/UnityProject/Library/ProtocolInstance.json
@@ -1 +1 @@
-[{"Port":54215,"SolutionName":"UnityProject"},{"Port":54216,"SolutionName":"UnityAndroidVRBrowser"}]
+[{"Port":49625,"SolutionName":"UnityProject"},{"Port":49626,"SolutionName":"UnityAndroidVRBrowser"}]
diff --git a/UnityProject/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/UnityProject/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
diff --git a/UnityProject/Library/ScriptAssemblies/Assembly-CSharp-Editor.pdb b/UnityProject/Library/ScriptAssemblies/Assembly-CSharp-Editor.pdb
diff --git a/UnityProject/Library/ScriptAssemblies/Assembly-CSharp.dll b/UnityProject/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/UnityProject/Library/ScriptAssemblies/Assembly-CSharp.pdb b/UnityProject/Library/ScriptAssemblies/Assembly-CSharp.pdb
diff --git a/UnityProject/Library/ScriptAssemblies/Unity.Analytics.Android.Editor.dll b/UnityProject/Library/ScriptAssemblies/Unity.Analytics.Android.Editor.dll
diff --git a/UnityProject/Library/ScriptAssemblies/Unity.Analytics.Android.Editor.pdb b/UnityProject/Library/ScriptAssemblies/Unity.Analytics.Android.Editor.pdb
diff --git a/UnityProject/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll b/UnityProject/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll
diff --git a/UnityProject/Library/ScriptAssemblies/Unity.CollabProxy.Editor.pdb b/UnityProject/Library/ScriptAssemblies/Unity.CollabProxy.Editor.pdb
diff --git a/UnityProject/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll b/UnityProject/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll
diff --git a/UnityProject/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.pdb b/UnityProject/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.pdb
diff --git a/UnityProject/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll b/UnityProject/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll
diff --git a/UnityProject/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.pdb b/UnityProject/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.pdb
diff --git a/UnityProject/Library/ScriptAssemblies/Unity.TextMeshPro.dll b/UnityProject/Library/ScriptAssemblies/Unity.TextMeshPro.dll
diff --git a/UnityProject/Library/ScriptAssemblies/Unity.TextMeshPro.pdb b/UnityProject/Library/ScriptAssemblies/Unity.TextMeshPro.pdb
diff --git a/UnityProject/Library/ScriptAssemblies/Unity.XR.Oculus.Editor.dll b/UnityProject/Library/ScriptAssemblies/Unity.XR.Oculus.Editor.dll
diff --git a/UnityProject/Library/ScriptAssemblies/Unity.XR.Oculus.Editor.pdb b/UnityProject/Library/ScriptAssemblies/Unity.XR.Oculus.Editor.pdb
diff --git a/UnityProject/Library/assetDatabase3 b/UnityProject/Library/assetDatabase3
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"Port":54215,"SolutionName":"UnityProject"},{"Port":54216,"SolutionName":"UnityAndroidVRBrowser"}]
		[{"Port":49625,"SolutionName":"UnityProject"},{"Port":49626,"SolutionName":"UnityAndroidVRBrowser"}]