From d506bd100ad60d75476443d8394bdc78f51393d3 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Tue, 27 Nov 2018 21:37:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BD=E6=95=B0=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E9=81=BF=E5=85=8D=E5=B2=90=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/NullWindow/main.cpp | 2 +- inc/hgl/render/RenderDevice.h | 4 ++-- src/RenderDevice/GLFW/RenderDeviceGLFW.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/example/NullWindow/main.cpp b/example/NullWindow/main.cpp index d82f47db..93a3f097 100644 --- a/example/NullWindow/main.cpp +++ b/example/NullWindow/main.cpp @@ -27,7 +27,7 @@ int main(void) RenderSetup rs; - RenderWindow *win=device->Create(1280,720,&ws,&rs); + RenderWindow *win=device->CreateWindow(1280,720,&ws,&rs); win->Show(); diff --git a/inc/hgl/render/RenderDevice.h b/inc/hgl/render/RenderDevice.h index ec8286e1..9c431f79 100644 --- a/inc/hgl/render/RenderDevice.h +++ b/inc/hgl/render/RenderDevice.h @@ -126,8 +126,8 @@ namespace hgl public: - virtual RenderWindow *Create(int,int,const WindowSetup *,const RenderSetup *)=0; ///<创建一个窗口渲染设备 - virtual RenderWindow *Create(const Display *,const VideoMode *,const RenderSetup *)=0; ///<创建一个全屏渲染设备 + virtual RenderWindow *CreateWindow(int,int,const WindowSetup *,const RenderSetup *)=0; ///<创建一个窗口渲染设备 + virtual RenderWindow *CreateFullscreen(const Display *,const VideoMode *,const RenderSetup *)=0; ///<创建一个全屏渲染设备 };//class RenderDevice RenderDevice *CreateRenderDeviceGLFW(); ///<创建一个基于GLFW的渲染设备 diff --git a/src/RenderDevice/GLFW/RenderDeviceGLFW.cpp b/src/RenderDevice/GLFW/RenderDeviceGLFW.cpp index 5f4a1728..85c21a43 100644 --- a/src/RenderDevice/GLFW/RenderDeviceGLFW.cpp +++ b/src/RenderDevice/GLFW/RenderDeviceGLFW.cpp @@ -156,7 +156,7 @@ namespace hgl public: - RenderWindow *Create(int width,int height,const WindowSetup *ws,const RenderSetup *rs) override + RenderWindow *CreateWindow(int width,int height,const WindowSetup *ws,const RenderSetup *rs) override { SetGLFWWindowHint(rs); @@ -174,7 +174,7 @@ namespace hgl return(CreateRenderWindowGLFW(win,false)); } - RenderWindow *Create(const Display *disp,const VideoMode *vm,const RenderSetup *rs) override + RenderWindow *CreateFullscreen(const Display *disp,const VideoMode *vm,const RenderSetup *rs) override { SetGLFWWindowHint(rs);