AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity
1,680 Commits 4 Branches 2 Tags
Commit Graph

253 Commits

Author SHA1 Message Date
David Williams
d69e840055 Merge branch 'develop' into feature/vertex-refactor 
Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h
	library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
	library/PolyVoxCore/source/VertexTypes.cpp
 2014-05-11 20:45:31 +02:00
David Williams
a34c106382 I accidentally merged the 'cubiquity-version' feature back into develop. It seems I can't simply reverse this commit (at least through SourceTree ) because it was a merge, so I'm having to simply revert the contents of the commit (i.e. the files). Bit of a mess! 2014-05-11 20:34:41 +02:00
David Williams
b0a8ca8a64 This commit templatizes the vertex classes on voxel types. This was the main change which was made for Cubiquity and it's very messy at the moment. However, this will improve when we make more use of 'auto' to hide the template madness. 2014-05-07 23:47:18 +02:00
David Williams
12246d1633 The PositionMaterial class can now be removed as we're not using it. 2014-05-05 20:58:35 +02:00
Daviw Williams
60396a2699 Merge branch 'develop' into feature/cubiquity-version 
Conflicts:
	library/PolyVoxCore/source/Impl/Utility.cpp
 2014-02-25 16:55:52 +01:00
Daviw Williams
2458f94feb Eliminating some differences from the cubiquity-version branch. 2014-02-25 16:51:26 +01:00
Daviw Williams
aeefe7f938 Merge branch 'develop' into feature/cubiquity-version 
Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h
 2014-02-25 16:35:54 +01:00
Matt Williams
bc17c802bb Assume C++11 support 
Remove all CMake checks for C++11 support since we now assume that we have it.
Replace all polyvox_* macros with standard C++ names.

See #48
 2014-02-14 15:03:26 +00:00
David Williams
376ce595d6 Merge branch 'develop' into feature/cubiquity-version 2014-01-31 21:20:04 +01:00
David Williams
248a5c3e29 Removed old logging system. 2014-01-30 22:10:52 +01:00
David Williams
2955b35743 Merge branch 'develop' into feature/cubiquity-version 2014-01-29 21:31:36 +01:00
David Williams
f4e03cc537 Macros now call new logging system instead of the old one. 2014-01-29 21:29:00 +01:00
Daviw Williams
84921f4d0b The existing logging code is rather large and overwhelming. I'm starting to replace it with a simpler system that should also be easier to maintain. 2014-01-29 16:53:11 +01:00
David Williams
20576d7a6f Merge branch 'develop' into feature/cubiquity-version 
Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
 2014-01-28 23:39:22 +01:00
David Williams
2ae5667986 Replaced some more logging commands with macros which can be compiled out. 2014-01-28 23:15:24 +01:00
David Williams
e0e860c45c Added <algorithm> 2014-01-28 20:59:55 +01:00
David Williams
52e25f2b3d Merge branch 'develop' into feature/cubiquity-version 2014-01-26 21:34:46 +01:00
Daviw Williams
c177891e5d Separated logging code into different .cpp/.h files. 2014-01-24 15:21:59 +01:00
Daviw Williams
15b170696c Merge branch 'develop' into feature/cubiquity-version 2013-11-14 15:36:25 +01:00
Daviw Williams
3db5e1b2f6 Added microsecond precision to timers. 2013-11-14 15:35:41 +01:00
Daviw Williams
8a07d93b54 Merge branch 'develop' into feature/cubiquity-version 2013-10-04 13:57:03 +02:00
Daviw Williams
4d683627da Added some comments. 2013-10-03 16:56:14 +02:00
Daviw Williams
ef615cc838 Added missing file. 2013-10-03 16:26:43 +02:00
Daviw Williams
319a0ce352 Removed old compression classes. 2013-10-01 15:58:32 +02:00
Daviw Williams
4ee2a61a15 Added a siply wrapper .h/cpp pair to abstract away the fact that miniz in provided as a single .c file which we include directly, and to avoid linker problems. 2013-10-01 15:33:40 +02:00
Matt Williams
f81b42747b Implement Timer for C++11 
This uses std::chrono::system_clock
 2013-08-22 20:40:45 +01:00
David Williams
6fb30a40f5 Bringing across Region enhancements from Cubiquity branch. 2013-08-09 20:39:17 +02:00
David Williams
fcf5b2b055 Making Cubiquity version of PolyVox more closely match develop version. 2013-08-09 20:32:20 +02:00
David Williams
6a009825b5 Merge branch 'develop' into feature/cubiquity-version 
Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
	library/PolyVoxCore/source/Region.cpp
 2013-08-09 17:05:57 +02:00
Matt Williams
7c74e1faff Move Timer.h to correct location 
Also add a missing semi-colon.
 2013-08-08 10:42:57 +01:00
David Williams
2f99964606 Tidying timer. 2013-08-07 23:24:20 +02:00
David Williams
9ad4c3fcf7 Initial checkin of Timer class. 2013-08-07 23:07:26 +02:00
David Williams
acf5bef5e7 Merge branch 'feature/large-volume-tidying' into develop 2013-08-01 16:34:38 +02:00
Matt Williams
7ee913c8a8 Fix the SWIG warning in the SWIG interface files 
This keeps the .cpp and .h files clean.
 2013-07-22 16:10:31 +01:00
David Williams
3971e6415c Added SWIG tests to stop build warning about operator<<. 2013-07-22 16:37:35 +02:00
David Williams
b5d930062b Const fixes. 2013-07-16 16:09:57 +02:00
Matt Williams
9f7f893b68 Change the types of the edgeTable and triTable 
The range on values in these tables is much less than needs an int so
making them specific width types packs them smaller.

I measure a 5% decrease in the size of the .so file created at -O3.
 2013-07-04 19:35:09 +01:00
David Williams
7cad8388b9 Merge branch 'develop' into feature/cubiquity-version 
Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/Region.h
	library/PolyVoxCore/source/Region.cpp
 2013-06-27 21:40:10 +02:00
David Williams
288b448b9f Brought across Region operator<< from Cubiquity branch. 2013-06-22 10:16:16 +02:00
Daviw Williams
869f5f6c49 Added function to check whether one region is inside of another. 2013-05-27 14:01:55 +02:00
Daviw Williams
a56005478d Fix for Linux compile error. 2013-05-27 12:59:19 +02:00
Daviw Williams
2b3e9ca206 Merge branch 'develop' into feature/cubiquity-version 2013-05-24 16:01:11 +02:00
Daviw Williams
d12a81d345 Log messages now automatically have std::endl applied, and work/behave similar to Qt logging functions. 2013-05-24 16:00:19 +02:00
Daviw Williams
fcb38f0796 Merge branch 'develop' into feature/cubiquity-version 2013-05-24 13:52:21 +02:00
Daviw Williams
c1461e7582 Added a null stream to suppress logging. 2013-05-24 13:51:52 +02:00
Daviw Williams
d7d3df2197 Merge branch 'develop' into feature/cubiquity-version 2013-05-24 13:30:04 +02:00
Daviw Williams
b12e6d045c Added additional logging streams. 2013-05-24 13:26:26 +02:00
Daviw Williams
b50d3a299b Merge branch 'develop' into feature/cubiquity-version 
Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h
	library/PolyVoxCore/source/Impl/ErrorHandling.cpp
 2013-05-22 15:38:16 +02:00
Daviw Williams
f3b0183013 Switching to a stream-based interface for logging. 2013-05-22 14:21:50 +02:00
Daviw Williams
c806da9bb7 Compile fixes brought across from Cubiquity. 2013-05-16 16:17:01 +02:00