Hartmut/pixwerx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactoring and cleaning while searching for a problem in the demo code

Browse source
This commit is contained in:
Hartmut Seichter 2021-01-07 23:02:08 +01:00
parent d2c8262c68
commit 0d2138c9f2
14 changed files with 427 additions and 453 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/binding/src/script_visual.cpp
View file

@ -45,12 +45,12 @@ void register_visual_function(sol::state&,sol::table &ns)
,"color",sol::property(&material::_color));
ns.new_usertype<mesh_renderer>("mesh_renderer"
,sol::constructors<mesh_renderer(),mesh_renderer(const geometry&)>()
,"create",&mesh_renderer::create
,"ready",sol::readonly_property(&mesh_renderer::ready)
,"release",&mesh_renderer::release
,"draw",&mesh_renderer::draw
ns.new_usertype<renderer>("mesh_renderer"
,sol::constructors<renderer(),renderer(const geometry&)>()
,"create",&renderer::create
,"ready",sol::readonly_property(&renderer::ready)
,"release",&renderer::release
,"draw",&renderer::draw
);
ns.new_usertype<framebuffer>("framebuffer"

2
src/scene/src/scene.cpp
View file

@ -14,7 +14,7 @@ struct mesh {
geometry geom;
};
struct mesh_renderer {
struct renderer {
std::unique_ptr<int> state;
// std::vector<matrials> mat;
};

4
src/scripts/demos/simple_000.lua
View file

@ -66,10 +66,6 @@ while w:update() do
t:reset()
print(pw.input:get().mouse_position.x,pw.input:get().mouse_position.y,w.client_size.width,w.client_size.height)
end
-- print("update")
end
--local scene = pw:scene.new()

96
src/scripts/demos/simple_002.lua
View file

@ -1,16 +1,14 @@
--
-- small demonstrator for Lua binding on pixwerx
-- demonstrator for Lua binding on pixwerx
--
pw.script:load_all()
print("hello pixwerx!")
local w = pw.window.new()
w.visible = false
-- set title
w.title = "pixwerx 0.1"
w.title = "My Cool 3D Content"
-- set size
w.size = pw.size.new(640,480)
@ -18,26 +16,24 @@ w.size = pw.size.new(640,480)
-- move window
w.position = pw.point.new(100,100)
-- create a new geometry
local g = pw.geometry:new()
g.topology = pw.geometry.triangles -- meh
g.vertices:clear()
g.vertices:add(pw.vector3:new(-1, 1, 0)) -- 0
g.vertices:add(pw.vector3:new(-1,-1, 0)) -- 1
g.vertices:add(pw.vector3:new( 1,-1, 0)) -- 2
g.vertices:add(pw.vector3:new( 1, 1, 0)) -- 3
z = 1.0
g.vertices:add(pw.vector3:new(-1, 1, z)) -- 0
g.vertices:add(pw.vector3:new(-1,-1, z)) -- 1
g.vertices:add(pw.vector3:new( 1,-1, z)) -- 2
g.vertices:add(pw.vector3:new( 1, 1, z)) -- 3
-- 0 --- 3
-- | \ |
-- 1 --- 2
print(g.vertices,#g.vertices,g.vertices[1].x)
g.indices:add(0)
g.indices:add(1)
g.indices:add(2)
@ -46,32 +42,15 @@ g.indices:add(2)
g.indices:add(3)
g.indices:add(0)
print(g.indices)
local mm = pw.matrix4x4:new()
local mv = pw.matrix4x4:new()
local mp = pw.matrix4x4:new()
w.visible = true
local fb = pw.framebuffer:new()
print(w.client_size.width,"x",w.client_size.height)
if fb:create(w.client_size) then
print("framebuffer ok")
else
print("framebuffer failed")
end
local s = pw.shader:new()
print(s.ready)
s:set_source(pw.shader_type.vertex,[[
#version 400
@ -95,24 +74,41 @@ void main() {
}
]])
print(s.ready)
if not s:build() then
print("Error!")
end
print(s.ready)
local renderer = pw.mesh_renderer:new()
if not renderer:create(g) then
print("couldn't create renderer")
end
-- setup a lua callback function as callback
w.on_update = function(self)
mm:set_identity()
mv = pw.matrixtransform.look_at(pw.vector3:new(0,0,0),pw.vector3.forward(),pw.vector3.up())
mp = pw.matrixtransform.perspective_projection(1.3,1.0,0.2,100)
local cl = pw.vector4:new( 1.0, 0.0, 0.0, 1.0 )
s:use()
s:set_uniform_mat4("model",mm)
s:set_uniform_mat4("view",mv)
s:set_uniform_mat4("projection",mp)
s:set_uniform_vec4("color",cl)
renderer:draw()
end
w.visible = true
while w:update() do
-- somehow works
if (pw.input.get().input_string == 'f') then
w.fullscreen = not w.fullscreen
@ -131,36 +127,4 @@ while w:update() do
print(pw.input:get().mouse_position.x,pw.input:get().mouse_position.y,w.client_size.width,w.client_size.height)
end
mm:set_identity()
mv = pw.matrixtransform.look_at(pw.vector3:new(0,0,0),pw.vector3.forward(),pw.vector3.up())
mp = pw.matrixtransform.perspective_projection(1.3,1.0,0.2,100)
local cl = pw.vector4:new( 1.0, 0, 0, 1.0)
s:use()
s:set_uniform_mat4("model",mm)
s:set_uniform_mat4("view",mv)
s:set_uniform_mat4("projection",mp)
s:set_uniform_vec4("color",cl)
fb:bind()
renderer:draw()
fb:blit()
fb:unbind()
end

1
src/system/include/pw/system/window.hpp
View file

@ -44,6 +44,7 @@ protected:
on_update_t _on_update;
};
}

11
src/system/src/window.cpp
View file

@ -152,11 +152,15 @@ struct window::impl {
glfwGetVersion(&glfw_major,&glfx_minor,&glfw_rev);
debug::d() << "GLFW " << glfw_major << "." << glfx_minor << "." << glfw_rev;
debug::d() << "GLFW header " << GLFW_VERSION_MAJOR << "." << GLFW_VERSION_MINOR << "." << GLFW_VERSION_REVISION;
// debug::d() << "GLFW " << glfw_major << "." << glfx_minor << "." << glfw_rev;
// debug::d() << "GLFW header " << GLFW_VERSION_MAJOR << "." << GLFW_VERSION_MINOR << "." << GLFW_VERSION_REVISION;
update_display_list();
// we default to window invisible by default
glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
// OpenGL
// request specific version 3.3
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
@ -182,7 +186,7 @@ struct window::impl {
rev = glfwGetWindowAttrib(_window, GLFW_CONTEXT_REVISION);
// maybe something to pass to the outside
debug::d() << "OpenGL " << major << "." << minor << "." << rev;
// debug::d() << "OpenGL " << major << "." << minor << "." << rev;
glfwSetWindowUserPointer(_window,this);
@ -213,6 +217,7 @@ struct window::impl {
{
if (_window && !glfwWindowShouldClose(_window))
{
// TODO lock an unlock the current input system to allow for late events coming in
input::get().reset();
// get new events

4
src/visual/CMakeLists.txt
View file

@ -4,7 +4,7 @@ set(hdrs
include/pw/visual/shader.hpp
include/pw/visual/pipeline.hpp
include/pw/visual/texture.hpp
include/pw/visual/mesh_renderer.hpp
include/pw/visual/renderer.hpp
include/pw/visual/material.hpp
)
@ -16,7 +16,7 @@ set(srcs
src/pipeline.cpp
src/target.cpp
src/texture.cpp
src/mesh_renderer.cpp
src/renderer.cpp
src/material.cpp
)

4
src/visual/include/pw/visual/pipeline.hpp
View file

@ -7,7 +7,7 @@
#include <pw/core/color.hpp>
#include <pw/visual/shader.hpp>
#include <pw/visual/mesh_renderer.hpp>
#include <pw/visual/renderer.hpp>
#include <pw/visual/material.hpp>
@ -45,7 +45,7 @@ struct render_pass {
const material& mat);
shader _shader;
mesh_renderer _renderer;
renderer _renderer;
};

8
src/visual/include/pw/visual/mesh_renderer.hpp → src/visual/include/pw/visual/renderer.hpp
View file

@ -12,12 +12,12 @@ class geometry;
/**
* @brief Connects mesh data with the render backend
*/
class mesh_renderer {
class renderer {
public:
mesh_renderer();
mesh_renderer(const geometry& m);
renderer();
renderer(const geometry& m);
~mesh_renderer();
~renderer();
bool create(const geometry &m);
void release();

28
src/visual/src/framebuffer.cpp
View file

@ -7,27 +7,28 @@
namespace pw {
// TODO stencil buffer?
struct framebuffer::impl {
size _size;
GLuint _fbo_draw;
GLuint _fbo_msaa;
GLuint _fbo_draw { std::numeric_limits<GLuint>::max() };
GLuint _fbo_msaa { std::numeric_limits<GLuint>::max() };
GLuint _rbo_color;
GLuint _rbo_depth;
GLuint _rbo_color { std::numeric_limits<GLuint>::max() };
GLuint _rbo_depth { std::numeric_limits<GLuint>::max() };
bool create(const size &s)
{
// TODO mak color resolution and
_size = s;
int max_msaa;
int max_msaa { 0 };
// query actual maximum MSAA
glGetIntegerv(GL_MAX_SAMPLES,&max_msaa);
// create a 4x MSAA renderbuffer object for colorbuffer
int msaa = std::min(max_msaa,4);
@ -39,13 +40,13 @@ struct framebuffer::impl {
glBindRenderbuffer(GL_RENDERBUFFER, _rbo_color);
glRenderbufferStorageMultisample(GL_RENDERBUFFER, msaa, GL_RGBA8, _size.width, _size.height);
// create a 4x MSAA renderbuffer object for depthbuffer
// create a MSAA renderbuffer object for depthbuffer
glGenRenderbuffers(1, &_rbo_depth);
glBindRenderbuffer(GL_RENDERBUFFER, _rbo_depth);
glRenderbufferStorageMultisample(GL_RENDERBUFFER, msaa, GL_DEPTH_COMPONENT, _size.width, _size.height);
// create a 4x MSAA framebuffer object
// create a MSAA framebuffer object
glGenFramebuffers(1, &_fbo_msaa);
glBindFramebuffer(GL_FRAMEBUFFER, _fbo_msaa);
@ -71,16 +72,16 @@ struct framebuffer::impl {
}
void bind()
{
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _fbo_msaa);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _fbo_draw);
}
void blit()
{
glBindFramebuffer(GL_READ_FRAMEBUFFER, _fbo_msaa); // src FBO (multi-sample)
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _fbo_draw); // dst FBO (single-sample)
// glBindFramebuffer(GL_READ_FRAMEBUFFER, _fbo_msaa); // src FBO (multi-sample)
// glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _fbo_draw); // dst FBO (single-sample)
glBlitFramebuffer(0, 0, _size.width, _size.height, // src rect
0, 0, _size.width, _size.height, // dst rect
@ -91,10 +92,7 @@ struct framebuffer::impl {
void unbind()
{
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
}
};

156
src/visual/src/mesh_renderer.cpp
View file

@ -1,156 +0,0 @@
#include "pw/visual/mesh_renderer.hpp"
#include "pw/core/geometry.hpp"
#include "pw/core/size.hpp"
#include "pw/core/debug.hpp"
#include "glad/glad.h"
#include <algorithm>
namespace pw {
struct mesh_renderer::impl {
GLuint _vao = 0;
std::vector<GLuint> _vbos;
GLint _mesh_elements = {0};
impl()
{
}
~impl()
{
release();
}
bool ready() const
{
return glIsVertexArray != nullptr && GL_TRUE == glIsVertexArray(_vao);
}
bool create(const geometry& m)
{
// reset if the renderer already in use
if (ready()) {
release();
}
glGenVertexArrays(1,&_vao);
glBindVertexArray(_vao);
size_t arrays_needed = 0;
// should bail out here
if (!m.vertices().empty()) arrays_needed++;
if (!m.indices().empty()) arrays_needed++;
_mesh_elements = m.indices().size();
// TODO: implement the other arrays
_vbos.resize(arrays_needed);
glGenBuffers(_vbos.size(), _vbos.data());
// vertices
glBindBuffer(GL_ARRAY_BUFFER, _vbos[0]);
glBufferData(GL_ARRAY_BUFFER,
sizeof(m.vertices().front()) * m.vertices().size(),
m.vertices().data(),
GL_STATIC_DRAW);
glEnableVertexAttribArray(0);
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
// indices
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _vbos[1]);
glBufferData(GL_ELEMENT_ARRAY_BUFFER,
sizeof(m.indices().front()) * m.indices().size(), m.indices().data(),
GL_STATIC_DRAW);
// stop binding
glBindVertexArray(0);
auto error = glGetError();
if (error != GL_NO_ERROR) {
debug::e() << "GL error: " << error;
}
return ready();
}
void release()
{
glDeleteVertexArrays(1,&_vao);
for (auto vbo : _vbos)
glDeleteBuffers(1,&vbo);
_vbos.clear();
}
void draw()
{
if (glIsVertexArray(_vao)) {
glBindVertexArray(_vao);
glDrawElements(GL_TRIANGLES, _mesh_elements, GL_UNSIGNED_INT, nullptr);
glBindVertexArray(0);
auto error = glGetError();
if (error != GL_NO_ERROR) {
debug::e() << "GL error: " << error;
}
}
}
// GLint get_mode(vertex_array::)
};
//
//
//
mesh_renderer::mesh_renderer()
: _impl(std::make_unique<mesh_renderer::impl>())
{
}
mesh_renderer::mesh_renderer(const geometry &m)
{
mesh_renderer();
_impl->create(m);
}
mesh_renderer::~mesh_renderer()
{
}
bool mesh_renderer::ready() const
{
return _impl->ready();
}
bool mesh_renderer::create(const geometry &m)
{
return _impl->create(m);
}
void mesh_renderer::release()
{
_impl->release();
}
void mesh_renderer::draw()
{
_impl->draw();
}
}

2
src/visual/src/pass.cpp
View file

@ -7,7 +7,7 @@
#include <pw/visual/material.hpp>
#include <pw/visual/shader.hpp>
#include <pw/visual/mesh_renderer.hpp>
#include <pw/visual/renderer.hpp>
namespace pw {

67
src/visual/src/pipeline.cpp
View file

@ -9,32 +9,14 @@
#include "pw/core/debug.hpp"
#include "pw/visual/pipeline.hpp"
#include "pw/visual/shader.hpp"
#include "pw/visual/mesh_renderer.hpp"
#include "pw/visual/renderer.hpp"
#include "pw/visual/material.hpp"
#include "pw/visual/framebuffer.hpp"
#include "glad/glad.h"
namespace pw {
class command {
};
class mesh_command : command {
// shader
// vertexarray
};
class queue {
// vector<commands> ...
};
void render_pass::submit(const geometry &g,
const matrix4x4 &model_mat,
@ -73,7 +55,7 @@ struct triangle_renderer
shader shader_p;
geometry amesh;
mesh_renderer renderer;
renderer r;
time::tick_t tick;
triangle_renderer()
@ -141,8 +123,8 @@ struct triangle_renderer
void draw()
{
if (!renderer.ready())
renderer.create(amesh);
if (!r.ready())
r.create(amesh);
// input needed here -
@ -152,7 +134,7 @@ struct triangle_renderer
auto v_col = ping_pong(static_cast<float>(time::now()),1.0f);
vector4f col({0.5f,1-v_col,v_col,1.0f});
vector4f col = {0.5f,1-v_col,v_col,1.0f};
matrix4x4f model_mat; model_mat.set_identity();
@ -187,12 +169,12 @@ struct triangle_renderer
#endif
#if 0
#if 1
// highly inefficient - should be cached -
shader_p.set("input_color",col);
shader_p.set("model",model_mat);
shader_p.set("view",view_mat);
shader_p.set("projection",proj_mat);
shader_p.set_uniform("input_color",col);
shader_p.set_uniform("model",model_mat);
shader_p.set_uniform("view",view_mat);
shader_p.set_uniform("projection",proj_mat);
#else
// new version with ...
@ -206,7 +188,7 @@ struct triangle_renderer
#endif
renderer.draw();
r.draw();
auto error = glGetError();
if (error != GL_NO_ERROR){
@ -220,6 +202,7 @@ struct triangle_renderer
struct pipeline::impl {
#if 0
size _size;
GLuint _fbo_draw;
@ -227,6 +210,10 @@ struct pipeline::impl {
GLuint _rbo_color;
GLuint _rbo_depth;
#endif
framebuffer fb;
//testing
triangle_renderer tr;
@ -235,6 +222,8 @@ struct pipeline::impl {
void draw();
impl() = default;
~impl() = default;
@ -255,6 +244,7 @@ GLuint generate_multisample_texture(const size& s,int samples)
bool pipeline::impl::create(::pw::size s)
{
#if 0
_size = s;
int max_msaa;
@ -301,6 +291,8 @@ bool pipeline::impl::create(::pw::size s)
// reset
glBindFramebuffer(GL_FRAMEBUFFER, 0);
#endif
tr.setup();
@ -316,10 +308,11 @@ void pipeline::impl::draw()
{
// glClearColor(1.0,0,0,1);
// glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
// glViewport(0,0,800,600);
glClearColor(1.0,0,0,1);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
// glViewport(0,0,800,600);
//
// draw pass
@ -354,6 +347,8 @@ void pipeline::impl::draw()
#else
#if 0
glBindFramebuffer(GL_READ_FRAMEBUFFER, _fbo_msaa); // src FBO (multi-sample)
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _fbo_draw); // dst FBO (single-sample)
@ -366,9 +361,15 @@ void pipeline::impl::draw()
glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
// debug::d() << _size.width << "x" << _size.height;
#endif
#endif
// fb.bind();
// fb.blit();
// fb.unbind();
GLenum err;
while((err = glGetError()) != GL_NO_ERROR)

165
src/visual/src/renderer.cpp Normal file
View file

@ -0,0 +1,165 @@
#include "pw/visual/renderer.hpp"
#include "pw/core/geometry.hpp"
#include "pw/core/size.hpp"
#include "pw/core/debug.hpp"
#include "glad/glad.h"
#include <algorithm>
namespace pw {
struct renderer::impl {
GLuint _vao = 0;
std::vector<GLuint> _vbos;
GLint _mesh_elements = { 0 };
impl() = default;
~impl()
{
release();
}
bool ready() const
{
return glIsVertexArray != nullptr && GL_TRUE == glIsVertexArray(_vao);
}
bool create(const geometry& m)
{
// reset if the renderer already in use
if (ready()) {
release();
}
glGenVertexArrays(1,&_vao);
// TODO check if valid?
glBindVertexArray(_vao);
size_t arrays_needed = 0;
// should bail out here
if (!m.vertices().empty()) arrays_needed++;
if (!m.indices().empty()) arrays_needed++;
_mesh_elements = m.indices().size();
// TODO: implement the other arrays
_vbos.resize(arrays_needed);
glGenBuffers(_vbos.size(), _vbos.data());
// vertices
glBindBuffer(GL_ARRAY_BUFFER, _vbos[0]);
glBufferData(GL_ARRAY_BUFFER,
sizeof(m.vertices().front()) * m.vertices().size(),
m.vertices().data(),
GL_STATIC_DRAW);
glEnableVertexAttribArray(0);
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
// indices
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _vbos[1]);
glBufferData(GL_ELEMENT_ARRAY_BUFFER,
sizeof(m.indices().front()) * m.indices().size(), m.indices().data(),
GL_STATIC_DRAW);
// stop binding
glBindVertexArray(0);
auto error = glGetError();
if (error != GL_NO_ERROR) {
debug::e() << "GL error: " << error;
}
return ready();
}
void release()
{
glDeleteVertexArrays(1,&_vao);
for (auto vbo : _vbos)
glDeleteBuffers(1,&vbo);
_vbos.clear();
}
void draw()
{
#if 1
glEnable(GL_CULL_FACE);
glCullFace(GL_BACK);
glFrontFace(GL_CCW);
#endif
glClearColor(0.0,1.0,0,1);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
if (glIsVertexArray(_vao))
{
glBindVertexArray(_vao);
glDrawElements(GL_TRIANGLES, _mesh_elements, GL_UNSIGNED_INT, nullptr);
glBindVertexArray(0);
auto error = glGetError();
if (error != GL_NO_ERROR)
{
debug::e() << "GL error: " << error;
}
}
}
// GLint get_mode(vertex_array::)
};
//
//
//
renderer::renderer()
: _impl(std::make_unique<renderer::impl>())
{
}
renderer::renderer(const geometry &m)
{
renderer();
_impl->create(m);
}
renderer::~renderer()
{
}
bool renderer::ready() const
{
return _impl->ready();
}
bool renderer::create(const geometry &m)
{
return _impl->create(m);
}
void renderer::release()
{
_impl->release();
}
void renderer::draw()
{
_impl->draw();
}
}