Subversion Repositories gelsvn

Rev

Show changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
691 3781 d 22 h jerf /trunk/src/GLGraphics/ needed to compile with VS2013  
629 4475 d 3 h asny /trunk/src/GLGraphics/ Made it possible to save images in ONG format when using SOIL  
628 4502 d 4 h mono /trunk/src/GLGraphics/ allow images where width is multiple of 1 (default is 4)  
627 4525 d 22 h jerf /trunk/src/GLGraphics/ killing unnecessary stb header file  
626 4541 d 4 h awkr /trunk/src/GLGraphics/ Added missing include.  
623 4587 d 8 h jerf /trunk/src/GLGraphics/ adding a function to GLViewController which sets up the camera using the usual input parameters  
618 4642 d 6 h jab /trunk/ Some changes to make curvature visualization work  
614 4643 d 7 h jab /trunk/ Fixed a problem with global variables in harmonics.cpp causing meshedit to crash on exit.  
609 4643 d 11 h jab /trunk/ I have added some patches to make cmake work for Unix Makefiles on Mac.
The old Makefile system has been removed.
Slight change to XCode project
Minor changes
 
608 4645 d 19 h jrf /trunk/src/GLGraphics/ ensuring compatibility with code based on pre-merge trunk version  
607 4645 d 19 h jrf /trunk/ removing Visual Studio warnings and some CMake problems  
603 4650 d 4 h jab /trunk/ Made it work with cmake  
601 4651 d 22 h jab /trunk/ The include statements for header files have been changed. Instead of including, like say

#include <CGLA/Vec3f.h>

we now use

#include "../CGLA/Vec3f.h"

for all files in the GEL library source tree (i.e. apps and test are not altered).

The point is that if GEL is used as an OSX framework and I include a GEL header, I have to do it like this:

#include <GEL/HMesh/myheader.h>

Now, inside myheader.h I may include CGLA/Vec3f.h, but how should this file be found? If I just add the GEL
framework as a framework, the path to the GEL headers is not added to the header search path because the
framework name (in this case GEL) is part of the header path. If all headers had been in one directory that
would not have mattered, since Vec3f.h would be in the same directory as myheader.h. But it is not. So, I
have made things more relative and it works well.
 
600 4654 d 5 h jab / Build system. I have both edited the bespoke Xcode project file, played with a premake4 build generator and our cmake system. Nothing works perfectly, but cmake might end up as the best solution. The cmake file now automatically finds the GEL files, but this entails that cmake is run when a new file is added.

Functions were added to Manifold: remove_face, remove_edge, remove_vertex. These do as advertised. I also added an add_face function (not tested but very simple ... hmmm famous last words)
the cpp/h file pairs close_holes and caps_and_needles were merged into "cleanup". To cleanup I added some functions that stitch meshes together, i.e. edges which share geometric end points are stitched.
 
598 4655 d 10 h jrf /trunk/src/ Bug: CMake unable to generate project. Fix: Removing deleted source files from CMake lists.  
597 4655 d 10 h jab / Some console stuff was not up to the right version  
594 4655 d 11 h jab /trunk/src/GLGraphics/ Resolved conflicts  
563 4951 d 7 h awk /trunk/  
561 4968 d 2 h awk /trunk/ Added GLGraphics::Console, a Quake-style console.

Added test application for console (test/GLGraphics-console).

Fixed Vec3f operator>>. The following now works:

CGLA::Vec3f in(0,1,2);
std::stringstream ss;
ss << in;
CGLA::Vec3f out;
ss >> out;
assert(in == out);

Didn't test any other VecXX types or Matrix types.. They might be broken.

Misc:
Fixed CMake Policy CMP0005 error.
Missing #include <iterator> in Manifold.cpp.
Disable ExportBuildSettings (deprecated in CMake)
 
555 5052 d 8 h jrf /trunk/ Update of the stb image library used by SOIL such that it can now also write png. I haven't yet extended the SOIL API, so call stbi_write_png(...) to use the new functionality.  
503 5613 d 8 h jrf /trunk/src/GLGraphics/ correction in comment  
502 5613 d 8 h jrf /trunk/src/GLGraphics/ GLSL shader update: Deleting shaders before returning 0 and printing filenames of loaded shaders when there is a compiler problem.  
492 5650 d 7 h jrf /trunk/ Repairing and cleaning the OBJ Viewer app:
- load.h and load.cpp were missing in the cmake list of the Geometry package (causing the viewer not to compile in VS).
- It was previously illegal to include draw.h after including gel_glut.h (the problem was inclusion of glew.h in header files included by draw.h. This is undesirable as an application does not necessarily need glew.h when using draw.h).
- A lot of unnecessary header files were included here and there.
 
449 5935 d 12 h jrf /trunk/src/GLGraphics/ small useful extension of the SOIL interface  
447 5939 d 6 h jab /trunk/src/GLGraphics/ Fixed some include guards  
441 5939 d 7 h jab /trunk/src/GLGraphics/ Loads textures now via SOIL  
432 5972 d 10 h jab /trunk/src/GLGraphics/ Allows drawing of Indexed face sets  
424 5985 d 10 h jrf /trunk/src/GLGraphics/ tab to space indentation  
414 6089 d 1 h jrf /trunk/src/GLGraphics/ My graphics driver requires
#extension GL_EXT_geometry_shader4 : enable
 
409 6104 d 6 h jrf /trunk/ bashing Visual Studio warnings  
402 6118 d 9 h mkm /trunk/ CMake files updated after jab's changes.  
400 6121 d 21 h jab /trunk/ Some minor changes.  
396 6123 d 5 h jab /trunk/src/GLGraphics/ I have added the SinglePassWireFrameRenderer which is a
fast path for triangle meshes.
I have addedd the IDBufferWireframeRenderer which is
less fast but should handle anything.
draw has grown some functions for wireframe drawing,
but you will need to use IDBufferWireframeRenderer directly,
it keeps a lot of state and it is difficult to make a
convenience function.
 
394 6124 d 7 h jab /trunk/ Minor changes to the viewcontroller and the MeshEdit application  
392 6134 d 6 h jab /trunk/ Many mostly minor changes. The QuatTrackball and GLViewController had
some questionable code that I improved. Fixed a bug in the loader.
 
385 6146 d 4 h jab /trunk/ CMakefiles included.

Note that exceptions were removed from Geometry/Polygonize.cpp since it did not play nice with visual studio 2005. An improved solution is needed so that the program does not just abort.
 
373 6165 d 7 h jrf /trunk/ eliminating errors and warnings in VS 2005 compile  
372 6165 d 10 h jab /trunk/ Minor changes to draw and the Xcode project  
369 6166 d 5 h jab /trunk/src/GLGraphics/ The SOIL - simple opengl image library is in the public domain. I added it to
GEL because it is much simpler to use and more compact than DevIL.
By including it in the actual GEL distribution, we also lower the number
of external dependencies by 1 while slightly increasing compilation time.
 
368 6167 d 4 h jrf /trunk/ Bruteforce wireframe rendering introduced in draw framework and OBJViewer. Texture toggle on/off introduced in OBJViewer.