rexy712
e0924c5895
Added ubo class template for handling Uniform Buffer Objects. This class automatically finds the offset and alignment for given data in a GLSL std140 uniform block. This makes it easy to just assign data through the gfx::ubo interface and bind that to the relevant shader_program's uniform block Changed shader_program's method of handling uniforms to match more closely to how vao handles its attributes. That is to call with the location as argument to get a proxy object on which to operate. I find this nicer to work with than having everything to do with uniforms in the shader_program class itself Add a flat_camera class which just assigns the near and far plane to 0 and 1 respectively Start work on a gui system which i'm really not confident about. Attempting to rethink how renderers work, but also no really confident about where i'm going with it Break out vbo_scoped_map into a more general scoped_buffer_map class so that vbo and ubo can utilize it Remove old gl_buffers units that were not really being used since my change over to opengl DSA functions Change the gfx::resource_manager to keep shared_ptr's in the container so the data can be more nicely shared Add missing aliases in math::fwd_declare.hpp for boolean types Change orthographic projection generator function to have the z values behave more in line with how opengl handles z depth. May have to undo this at some point but it seems to behave correctly now Fix some rvalue related aspects of util::deferred '
92 lines
2.6 KiB
C++
92 lines
2.6 KiB
C++
/**
|
|
This file is a part of our_dick
|
|
Copyright (C) 2020-2022 rexy712
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU Affero General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU Affero General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Affero General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef OUR_DICK_GRAPHICS_BUFFER_MAP_TPP
|
|
#define OUR_DICK_GRAPHICS_BUFFER_MAP_TPP
|
|
|
|
#include <utility> //exchange, swap
|
|
#include "gl_include.hpp"
|
|
|
|
namespace gfx{
|
|
|
|
template<typename T>
|
|
scoped_buffer_map<T>::scoped_buffer_map(GLuint bid, buffer::maptype m):
|
|
m_buffer(bid)
|
|
{
|
|
m_data = reinterpret_cast<pointer>(glMapNamedBuffer(m_buffer, static_cast<GLenum>(m)));
|
|
}
|
|
template<typename T>
|
|
scoped_buffer_map<T>::scoped_buffer_map(scoped_buffer_map&& m):
|
|
m_data(std::exchange(m.m_data, nullptr)),
|
|
m_buffer(std::exchange(m.m_buffer, 0)){}
|
|
template<typename T>
|
|
scoped_buffer_map<T>::~scoped_buffer_map(void){
|
|
if(m_data){
|
|
glUnmapNamedBuffer(m_buffer);
|
|
}
|
|
}
|
|
template<typename T>
|
|
scoped_buffer_map<T>& scoped_buffer_map<T>::operator=(scoped_buffer_map&& m){
|
|
std::swap(m_data, m.m_data);
|
|
std::swap(m_buffer, m.m_buffer);
|
|
return *this;
|
|
}
|
|
template<typename T>
|
|
auto scoped_buffer_map<T>::length(void)const -> size_type{
|
|
GLint64 retval;
|
|
glGetNamedBufferParameteri64v(m_buffer, GL_BUFFER_MAP_LENGTH, &retval);
|
|
return retval;
|
|
}
|
|
template<typename T>
|
|
auto scoped_buffer_map<T>::release(void) -> pointer{
|
|
m_buffer = 0;
|
|
return std::exchange(m_data, nullptr);
|
|
}
|
|
template<typename T>
|
|
scoped_buffer_map<T>::operator pointer(void){
|
|
return m_data;
|
|
}
|
|
template<typename T>
|
|
scoped_buffer_map<T>::operator const_pointer(void)const{
|
|
return m_data;
|
|
}
|
|
template<typename T>
|
|
auto scoped_buffer_map<T>::raw(void) -> pointer{
|
|
return m_data;
|
|
}
|
|
template<typename T>
|
|
auto scoped_buffer_map<T>::raw(void)const -> const_pointer{
|
|
return m_data;
|
|
}
|
|
template<typename T>
|
|
bool scoped_buffer_map<T>::valid(void)const{
|
|
return m_data;
|
|
}
|
|
template<typename T>
|
|
auto scoped_buffer_map<T>::operator[](size_type i) -> reference{
|
|
return m_data[i];
|
|
}
|
|
template<typename T>
|
|
auto scoped_buffer_map<T>::operator[](size_type i)const -> const_reference{
|
|
return m_data[i];
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|