OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0029393: Samples - AndroidQt sample build fail

Browse Source 
AndroidQt - dropped removed arguments within V3d_View::SetWindow() usage [0024776].
AndroidQt_Window - add missing NativeFBConfig() method declared in the interface [0026732].
This commit is contained in:
kgv 2017-12-19 14:00:10 +03:00 committed by bugmaster
parent c805f9a8f8
commit 81a2800c0d
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samples/qt/AndroidQt/AndroidQt.cxx
View File

@ -170,7 +170,7 @@ void AndroidQt::sync()
//myView->MustBeResized(); // can be used instead of SetWindow() when EGLsurface has not been changed //myView->MustBeResized(); // can be used instead of SetWindow() when EGLsurface has not been changed
EGLContext anEglContext = eglGetCurrentContext(); EGLContext anEglContext = eglGetCurrentContext();
myView->SetWindow (aWindow, (Aspect_RenderingContext )anEglContext, NULL, NULL); myView->SetWindow (aWindow, (Aspect_RenderingContext )anEglContext);
} }
} }
} }
@ -247,7 +247,7 @@ bool AndroidQt::initViewer()
} }
aWindow->SetSize (aWidth, aHeight); aWindow->SetSize (aWidth, aHeight);
myView->SetWindow (aWindow, (Aspect_RenderingContext )anEglContext, NULL, NULL); myView->SetWindow (aWindow, (Aspect_RenderingContext )anEglContext);
} }
Handle(OpenGl_GraphicDriver) aDriver = new OpenGl_GraphicDriver (NULL, Standard_False); Handle(OpenGl_GraphicDriver) aDriver = new OpenGl_GraphicDriver (NULL, Standard_False);
@ -273,7 +273,7 @@ bool AndroidQt::initViewer()
Handle(AndroidQt_Window) aWindow = new AndroidQt_Window (aWidth, aHeight); Handle(AndroidQt_Window) aWindow = new AndroidQt_Window (aWidth, aHeight);
myView = myViewer->CreateView(); myView = myViewer->CreateView();
myView->SetWindow (aWindow, (Aspect_RenderingContext )anEglContext, NULL, NULL); myView->SetWindow (aWindow, (Aspect_RenderingContext )anEglContext);
myView->TriedronDisplay (Aspect_TOTP_RIGHT_LOWER, Quantity_NOC_WHITE, 0.08, V3d_ZBUFFER); myView->TriedronDisplay (Aspect_TOTP_RIGHT_LOWER, Quantity_NOC_WHITE, 0.08, V3d_ZBUFFER);
return true; return true;

11
samples/qt/AndroidQt/AndroidQt_Window.h
View File

@ -20,7 +20,7 @@
//! The main functionality is viewport dimensions. //! The main functionality is viewport dimensions.
class AndroidQt_Window : public Aspect_Window class AndroidQt_Window : public Aspect_Window
{ {
DEFINE_STANDARD_RTTIEXT(AndroidQt_Window, Aspect_Window)
public: public:
//! Creates a wrapper over existing Window handle //! Creates a wrapper over existing Window handle
@ -34,7 +34,8 @@ public:
//! Returns parent of native Window handle. //! Returns parent of native Window handle.
virtual Aspect_Drawable NativeParentHandle() const { return 0; } virtual Aspect_Drawable NativeParentHandle() const { return 0; }
virtual void Destroy() {} //! Returns native Window FB config (GLXFBConfig on Xlib)
virtual Aspect_FBConfig NativeFBConfig() const { return 0; }
//! Opens the window <me> //! Opens the window <me>
virtual void Map() const {} virtual void Map() const {}
@ -84,12 +85,6 @@ private:
int myY1; int myY1;
int myY2; int myY2;
public:
DEFINE_STANDARD_RTTIEXT(AndroidQt_Window,Aspect_Window)
}; };
DEFINE_STANDARD_HANDLE(AndroidQt_Window, Aspect_Window)
#endif // ANDROIDQT_WINDOW_H #endif // ANDROIDQT_WINDOW_H