none

Martin20150405 · Feb 25, 2018 · f4a52ff · f4a52ff
1 parent a775a21
commit f4a52ff
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/pano360demo/release/pano360demo-release.apk b/pano360demo/release/pano360demo-release.apk
diff --git a/pano360demo/src/main/java/com/martin/ads/pano360demo/HomeActivity.java b/pano360demo/src/main/java/com/martin/ads/pano360demo/HomeActivity.java
@@ -130,7 +130,8 @@ private void start(){
                 .setFilePath(filePath)
                 .setMimeType(mimeType)
                 .setPlaneModeEnabled(planeModeEnabled)
-                .setRemoveHotspot(false)
+                //set it false to see default hotspot
+                .setRemoveHotspot(true)
                 .setVideoHotspotPath(videoHotspotPath);
 
         if((mimeType & MimeType.BITMAP)!=0){

diff --git a/vrlib/src/main/java/com/martin/ads/vrlib/PanoRender.java b/vrlib/src/main/java/com/martin/ads/vrlib/PanoRender.java
@@ -123,8 +123,8 @@ public void onDrawFrame(GL10 glUnused) {
             panoMediaPlayerWrapper.doTextureUpdate(((OESFilter)firstPassFilter).getSTMatrix());
         }
         filterGroup.drawToFBO(0,fbo);
-        fbo.unbind();
-        screenDrawer.onDrawFrame(fbo.getFrameBufferTextureId());
+        if(fbo!=null)
+            screenDrawer.onDrawFrame(fbo.getFrameBufferTextureId());
 
         if (saveImg){
             BitmapUtils.sendImage(surfaceWidth, surfaceHeight,statusHelper.getContext());

diff --git a/vrlib/src/main/java/com/martin/ads/vrlib/filters/base/FilterGroup.java b/vrlib/src/main/java/com/martin/ads/vrlib/filters/base/FilterGroup.java
@@ -76,6 +76,7 @@ public void drawToFBO(int textureId,FBO fbo) {
                 }else{
                     filter.onDrawFrame(previousTexture);
                 }
+                fbo.unbind();
             }
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,6 +76,7 @@ public void drawToFBO(int textureId,FBO fbo) { @@
                     }else{
                         filter.onDrawFrame(previousTexture);
                     }
+                    fbo.unbind();
                 }
             }
         }
@@ Expand Down @@