Merge ../ldforge into gl

- now actually renders stuff correctly

- renamed some member variables for clarity

- removed some unneeded code

- converted to VBO

Merge ../ldforge into gl

- refactoring

- rename GLCompiler::Vertex to GLCompiler::VAO to avoid name conflicts

- renamed VertexCompiler to GLCompiler

- reworked the vertex compiler, objects are now colorized properly

- Merge ../ldforge into gl

- Merge ../ldforge into gl

- now compiles again

- Merge commit '5c835eb' into HEAD

now compiles again

Merge branch 'master' into gl

Merge branch 'master' into gl

- moved the uncolorize action to the color toolbar, renamed to uncolor

- use the keyword 'not' in place of the exclamation mark for operator!, this is clearer. also converted uses of '== false' to this.

- renamed some cmake identifiers

- now compiles with clang

- doubled buffer sizes in updaterevision to prevent GIT_HASH from being truncated

- some tweaks to version.cc

- generate gitinfo.h in the build directory, not source directory. made ldforge depend on revision_check properly

- use index-based iterating in LDDocument::closeUnused because deleting documents while iterating over g_loadedFiles causes the iterator to become invalidated

- renamed files to camelCase

- added a long int overload to StringFormatArg

- fixed various compilation issues

- doxygen'd DocumentPointer.h

- doxygenified Version.h

- changed doxygen entity style from @argh to \argh

- whoah whoops

- doxygenified Types.h

- made MessageLog.h and RingFinder.h suitable for doxygen

- added doxygen support for MainWindow.h

- added license header to format.h

- replaced the fmt/log/dlog/fprint macros in favor of template functions. renamed to format, print, dprint and fprint respectively.

- forgot macros.h out of the previous commit

- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh

- changed header guards into #pragma once

- renamed LDObject::deleteSelf to LDObject::destroy

- unified separator styles

- renamed several LDObject methods

- removed debug stuff

- replaced the left-hand document list with a tab bar

- derp

- separated version stuff to new files to allow version changes be compiled near-instantly

- fixed compilation

- migrated to CMake again

- reorganized the toolbar a little bit

- updated the PROPERTY macro

- refactored filenames

- bleh, don't need IN_IDE_PARSER there..

- added dvalof debug macro

- some corrections to zoomtofit

- removed some pointless typedefs

- changed the default color toolbar

- forgot the invokation deferer files

- refactoring

- added .cfg files to .gitignore

- use the correct text color to draw coordinates on the viewport

- GL-variables that should be document-specific are now properly document-specific (i.e. pan and zoom won't be shared across documents anymore)

- make the remaining virtual methods of LDObject pure virtual

- added a type alias LDObjectList

- whoopsie, forgot to re-add the cache flag to that inline flagset there

- make subfile references subject to position transformation again

- improved rotation point finding behavior. not sure what did I even do to improve it...

- use QCoreApplication::applicationDirPath instead of a custom hack to get the application path

- changelog: the file loading fix was backported to 0.2.1

- configuration is now always situated and read from the application working directory

- did stuff to types, fixed primitive listing

- removed the File class in favor of QFile

- if loading another file to replace an explicitly loaded file, this file won't get closed automatically and thus needs to be manually closed. We also need to check that it's safe to close before doing this. Also fixed a rather argh problem with ::save not using the proper path...

- corrected relationships between documents: opening a main file with the same name as another document is to overload it and editing the document is to invalidate its cache so that it gets rendered properly in other documents possibly referencing it.

- removed the 'str' typedef, use QString directly

- use --long in the git describe command for the GIT_DESCRIBE macro definition

- some cleanup

- reformatting

- added Ball Joint-8 stuff to primitive categories

- updated copyright year in the about prompt

- updated copyright year. Best wishes for 2014!

- when configuration options are default, they need to be removed from the settings

- whoops, forgot an #include in gldraw.cc

- minor edit

- split the ring finder to separate files

- fixed: subfile rotation had matrix multiplication done with operands the wrong way around, causing morphing

- removed some unnecessary full refreshes

- added a configurable select color

- "black edges" now actually mean white edges when the background is dark

- removed debug code from ldobject::select

- refactored config code

- use a local file with QSettings at all times. Registry is such a pain..

- now recognizes the recently added 8\ subdirectory

- removed the horrible actions.h hack in favor of usage of Qt's meta object system

- updated .gitignore

- forgot this too!

(0) -300 -100 -96 +96 +100 +300 tip

mercurial