Quellcode durchsuchen

gpu: rename FrameBuffer to Framebuffer.

master
Sam Hocevar vor 11 Jahren
Ursprung
Commit
a515e4d690
4 geänderte Dateien mit 15 neuen und 15 gelöschten Zeilen
  1. +11
    -11
      neercs/video/render.cpp
  2. +2
    -2
      neercs/video/render.h
  3. +1
    -1
      neercs/video/text-render.cpp
  4. +1
    -1
      neercs/video/text-render.h

+ 11
- 11
neercs/video/render.cpp Datei anzeigen

@@ -841,9 +841,9 @@ ShaderUniform shader_radial_texture,
shader_radial_screen_size,
shader_radial_radial;

FrameBuffer *fbo_back, *fbo_front, *fbo_screen;
FrameBuffer *fbo_blur_h, *fbo_blur_v;
FrameBuffer *fbo_tmp, *fbo_buffer;
Framebuffer *fbo_back, *fbo_front, *fbo_screen;
Framebuffer *fbo_blur_h, *fbo_blur_v;
Framebuffer *fbo_tmp, *fbo_buffer;

void Render::TraceQuad()
{
@@ -851,7 +851,7 @@ void Render::TraceQuad()
glDrawArrays(GL_QUADS, 0, 4);
}

void Render::ShaderSimple(FrameBuffer *fbo_output, int n)
void Render::ShaderSimple(Framebuffer *fbo_output, int n)
{
shader_simple->Bind();
shader_simple->SetUniform(shader_simple_texture, fbo_output->GetTexture(), n);
@@ -865,13 +865,13 @@ int Render::InitDraw(void)
glEnable(GL_CULL_FACE); // disable cull face
glCullFace(GL_BACK); // don't draw front face
/* initialise framebuffer objects */
fbo_back = new FrameBuffer(screen_size);
fbo_screen = new FrameBuffer(screen_size);
fbo_front = new FrameBuffer(screen_size);
fbo_buffer = new FrameBuffer(screen_size);
fbo_blur_h = new FrameBuffer(screen_size);
fbo_blur_v = new FrameBuffer(screen_size);
fbo_tmp = new FrameBuffer(screen_size);
fbo_back = new Framebuffer(screen_size);
fbo_screen = new Framebuffer(screen_size);
fbo_front = new Framebuffer(screen_size);
fbo_buffer = new Framebuffer(screen_size);
fbo_blur_h = new Framebuffer(screen_size);
fbo_blur_v = new Framebuffer(screen_size);
fbo_tmp = new Framebuffer(screen_size);
// shader simple
shader_simple = Shader::Create(LOLFX_RESOURCE_NAME(simple));
shader_simple_texture = shader_simple->GetUniformLocation("texture");


+ 2
- 2
neercs/video/render.h Datei anzeigen

@@ -23,7 +23,7 @@ protected:
private:
int CreateGLWindow();
int InitDraw();
void ShaderSimple(FrameBuffer *fbo_output, int n);
void ShaderSimple(Framebuffer *fbo_output, int n);
void TraceQuad();
void Pause();
void Shader();
@@ -50,4 +50,4 @@ private:
bool m_shader_radial;
};

#endif // __VIDEO_RENDER_H__
#endif // __VIDEO_RENDER_H__

+ 1
- 1
neercs/video/text-render.cpp Datei anzeigen

@@ -87,7 +87,7 @@ void TextRender::CreateBuffers()
m_vbo3->Unlock();
#endif

m_fbo = new FrameBuffer(m_fbo_size);
m_fbo = new Framebuffer(m_fbo_size);
}

void TextRender::Render()


+ 1
- 1
neercs/video/text-render.h Datei anzeigen

@@ -28,7 +28,7 @@ private:
VertexDeclaration *m_vdecl;
VertexBuffer *m_vbo1, *m_vbo2, *m_vbo3;

FrameBuffer *m_fbo;
Framebuffer *m_fbo;
};

#endif // __TEXT_RENDER_H__


Laden…
Abbrechen
Speichern