Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] New renderer #287

Closed
wants to merge 32 commits into from
Closed

[WIP] New renderer #287

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
36a3238
buildsystem: inotify package search name lowercased
TheJJ Apr 19, 2015
16aea56
buildsystem: implemented vulkan cmake module
TheJJ Apr 19, 2015
7880ff0
buildsystem: integrated vulkan and opengl detection
TheJJ Apr 19, 2015
f36e375
renderer: modular render window and context creation
TheJJ Apr 20, 2015
4b745d2
renderer: legacy opengl square rendering
TheJJ Jun 25, 2015
5ed8d71
renderer: initial generic texture implementation
TheJJ Jun 29, 2015
46049a8
renderer: rendering quad with opengl 3.3
TheJJ Jun 29, 2015
d1aafcf
renderer: texture and shader creation abstractions
TheJJ Aug 10, 2015
cb9ff46
util: modernized whole file reading
TheJJ Aug 11, 2015
912580a
renderer: use the full framebuffer for the test quad
TheJJ Aug 11, 2015
d94e1b3
renderer: implemented loading shaders from file
TheJJ Aug 11, 2015
006f9fd
watch: created new file watching subsystem
TheJJ Aug 12, 2015
f3b1edb
assetmanager: use new file watching subsystem
TheJJ Aug 12, 2015
e30b151
renderer: initially integrated into the engine
TheJJ Aug 12, 2015
bc19ac9
renderer: renamed pipeline Program to RawProgram
TheJJ Aug 13, 2015
d340348
renderer: moved program api contents to separate files
TheJJ Aug 13, 2015
b783458
renderer: initial pipeline variable abstraction
TheJJ Aug 25, 2015
89210b0
error: always collect backtrace information
TheJJ Sep 15, 2015
4a63a69
renderer: demo id selection via cython
TheJJ Sep 15, 2015
22162c0
renderer: first successful texture draw
TheJJ Sep 15, 2015
3c4e93a
renderer: basic uniform variable abstraction
TheJJ Sep 16, 2015
e0afef1
renderer: implemented vertex attribute packing and uploading
TheJJ Sep 18, 2015
7a24057
datastructure: implemented constexpr key-value map
TheJJ Sep 19, 2015
2cce2cc
renderer: drawing texture with pipeline abstraction
TheJJ Sep 20, 2015
b6c0089
util: implemented quaternion
TheJJ Sep 23, 2015
8446bd5
renderer: made error checking context-dependent
TheJJ Oct 2, 2015
88e7393
renderer: only upload gpu buffer when changed.
TheJJ Oct 21, 2015
459d735
renderer: towards render tasks by storing uniform state
TheJJ Nov 5, 2015
2ec7544
renderer: opengl version checking
Vtec234 Nov 8, 2016
b380899
misc: add YouCompleteMe metadata to .gitignore and add self to authors
Vtec234 Nov 8, 2016
880fdb8
engine: adjust new upstream changes to renderer branch changes
Vtec234 Nov 8, 2016
47c89b0
build: fix build on GCC 5.3.0 Gentoo Linux
Vtec234 Nov 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
build: fix build on GCC 5.3.0 Gentoo Linux
  • Loading branch information
@Vtec234
Vtec234 committed Nov 8, 2016
commit 47c89b00d134c3979efc5e8662fcd5ce183851d7
5 changes: 5 additions & 0 deletions libopenage/assetmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@

#include "assetmanager.h"

#ifdef WITH_INOTIFY
#include <sys/inotify.h>
#endif

#include "error/error.h"
#include "log/log.h"
#include "texture.h"
#include "util/compiler.h"
#include "util/file.h"
#include "watch/watch.h"


namespace openage {

AssetManager::AssetManager(qtsdl::GuiItemLink *gui_link)
Expand Down
2 changes: 2 additions & 0 deletions libopenage/assetmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

#include "util/dir.h"
#include "watch/watch.h"
#include "config.h"


namespace qtsdl {
class GuiItemLink;
Expand Down
2 changes: 1 addition & 1 deletion libopenage/engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ class Engine : public ResizeHandler, public options::OptionNode {
*/
std::unique_ptr<gui::GuiBasic> gui;

/*
/**
* The renderer. Accepts all tasks to be drawn on screen.
*/
std::unique_ptr<renderer::Renderer> renderer;
Expand Down
3 changes: 3 additions & 0 deletions libopenage/watch/linux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@

#include "watch.h"

// GCC stdlib defines linux as 1. Why would anybody use lowercase macros?
#undef linux


namespace openage {
namespace watch {
Expand Down