|
|
f2ba500c4c
|
Merge branch 'develop' into feature/vertex-refactor
Conflicts:
examples/Basic/main.cpp
examples/Paging/main.cpp
examples/SmoothLOD/main.cpp
library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.h
tests/TestCubicSurfaceExtractor.cpp
tests/TestSurfaceExtractor.cpp
tests/TestVolumeSubclass.cpp
|
2014-05-12 23:04:19 +02:00 |
|
|
|
347028199c
|
Paging example now also uses free-function surface extractor.
|
2014-05-11 16:27:38 +02:00 |
|
|
|
573c36db87
|
Renamed vertex classes to the far more meaningful 'CubicVertex' and 'MarchingCubesVertex'. The old names didn't make much sense, even less so now they are templatized.
|
2014-05-11 15:17:59 +02:00 |
|
|
|
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 |
|
|
|
4c2aea3db1
|
Removed CubicSurfaceExtractorWithNornals. Going forward users will be expected to compute flat normals in the fragment shader.
|
2014-05-06 22:00:24 +02:00 |
|
|
|
e35b58ba18
|
Fixed paging example.
|
2013-07-31 15:49:00 +02:00 |
|
|
|
4478e365c9
|
Removed RLECompressor as the code is now in RLEBlockCompressor.
Things are starting to get back under control. All tests pass, and all examples except PagingExample work.
|
2013-07-30 17:01:27 +02:00 |
|
|
|
7146b5ecdb
|
The idea of a 'setTargetMemoryLimitInBytes' function was not really working out. It was too comp-lex and not really clear what the ideal size would be. I think user code needs to call setMaxNumberOfBlocksInMemory() and setMaxNumberOfUncompressedBlocks() directly, if they see from profiling toat too much camressing or paging is taking place.
|
2013-07-23 13:15:01 +02:00 |
|
|
|
a00574351f
|
Renamed Block to CompressedBlock
|
2013-07-11 16:38:28 +02:00 |
|
|
|
0d92bc6c8c
|
Starting to split Block class into CompressedBlock and UncompressedBlock.
|
2013-07-11 16:17:48 +02:00 |
|
|
|
bd60f34bd7
|
Removing explicit functions to control the number of compressed and uncompressed blocks in memory, and letting the user set a memory limit instead.
|
2013-07-04 16:23:58 +02:00 |
|
|
|
26f512eba7
|
Fixed compile warning.
|
2013-07-02 16:08:52 +02:00 |
|
|
|
839f366174
|
Compile fixes for Linux.
Added SWIG files to make bindings build.
|
2013-06-28 15:07:19 +02:00 |
|
|
|
72b3cd5154
|
Tidying up and comments.
|
2013-06-26 23:39:21 +02:00 |
|
|
|
1064ea1c47
|
Stripped out unused code.
|
2013-06-26 22:14:01 +02:00 |
|
|
|
acb43d54d9
|
Fixed paging example.
|
2013-06-26 22:08:49 +02:00 |
|
|
|
44d525f591
|
Tidying up and refactoring LargeVolume.
|
2013-06-26 17:02:06 +02:00 |
|
|
|
785ac611b9
|
Work on file paging.
|
2013-06-22 11:20:05 +02:00 |
|
|
|
5664e2f681
|
Restored Paging Example back to previous values.
|
2013-06-22 07:30:06 +02:00 |
|
|
|
a14de4a72e
|
Replaced std::functions with Pager class for paging.
|
2013-06-16 19:48:14 +02:00 |
|
|
|
414a012230
|
Creating a Perlin noise generator as a 'pager'.
|
2013-06-16 19:12:37 +02:00 |
|
|
|
60d6658e1a
|
Changed a couple of 'getVoxelAt()' to 'getVoxel()'.
|
2013-06-12 13:38:36 +02:00 |
|
|
|
b7eeda3370
|
Find and replace all instance of getLowerCorner().getX(), etc with getLowerX(), etc has resulted in all tests now running in 120 seconds instead of 144 seconds because it avoids creating temporary objects.
|
2013-02-08 16:15:53 +01:00 |
|
|
|
301f93d896
|
Turned isQuadNeeded() (which was a stl::function) into a function object.
|
2012-08-09 16:06:10 +02:00 |
|
|
|
679d98735a
|
Renamed SurfaceExtractor to MarchingCubesSurfaceExtractor.
|
2012-07-15 17:40:37 +02:00 |
|
|
|
777b631f88
|
Mostly removed use of VoxelTypeTraits. It's a bit messy because I'm committing halfway through, as I'm away fro my development machine for the next week and want to pick this up from my laptop.
SurfaceExtractor test is currently broken due to custom threshold support not curretly working.
|
2012-07-05 14:49:51 +02:00 |
|
|
|
29d816d416
|
Removed template template parameters from SurfaceExtractor.
|
2012-05-18 15:38:18 +02:00 |
|
|
|
c483b44a41
|
Replaced constants with functions for type traits.
|
2012-02-06 17:51:37 +01:00 |
|
|
|
49b5fb3f67
|
Refactoring of basic voxel types.
|
2012-01-12 17:14:45 +01:00 |
|
|
|
c73b45b721
|
Fixed bug with RawVolume always starting coordinates at (0,0,0).
Removed Filters.h/.inl
Added Summed Area Table support to LowPassFilter.
Added test for low pass filter.
|
2011-08-13 08:57:45 +01:00 |
|
|
|
834aa5d6c3
|
Warning fixes for GCC 4.6.
|
2011-07-04 22:21:27 +01:00 |
|
|
|
528cb73771
|
Moved headers into subdirectories.
|
2011-05-17 22:27:46 +01:00 |
|
|
|
3a171e698b
|
Modified SurfaceExtractor to use template template parameters.
|
2011-04-30 23:51:04 +01:00 |
|
|
|
ea309ab15b
|
Renamed Volume to LargeVolume.
|
2011-04-28 21:21:59 +01:00 |
|
|
|
a1d05423be
|
Cut down paging example, as it was running too slowly.
|
2011-04-04 21:41:41 +00:00 |
|
|
|
a364f6d72c
|
More flush/prefetch work from ker.
|
2011-03-24 21:34:57 +00:00 |
|
|
|
78c5884303
|
Applied ker's patch for prefetch and flush.
|
2011-03-22 21:44:12 +00:00 |
|
|
|
8306be728d
|
Moved to perlin nose code to a separate file for copyright reasons.
|
2011-03-20 22:56:32 +00:00 |
|
|
|
40295c84b1
|
Added paging example and reverted basic example back to it's previous state.
|
2011-03-20 22:42:05 +00:00 |
|
