2073 Commits

Author SHA1 Message Date
David Williams
c384fbfea8 Revert "Eliminated member variable."
This reverts commit 96ec47a972fea2cd6efcaddd276728f8062d8f7b.
2015-05-25 20:35:47 +02:00
David Williams
96ec47a972 Eliminated member variable. 2015-05-25 17:45:40 +02:00
David Williams
13be35aac9 Rather ugly split of some code into a separate function, to keep the main loop as small and simple as possible. To be tidied up shortly. 2015-05-25 17:37:30 +02:00
David Williams
e0ce93acb1 Added comments. 2015-05-25 16:45:52 +02:00
David Williams
b353cd1ce8 Removed unneeded conditions. 2015-05-25 16:39:30 +02:00
David Williams
ecc06ba986 Changed the way samplers are used for a minor speed improvement. 2015-05-25 12:05:15 +02:00
David Williams
f4941fb73c Minor tweaks. 2015-05-24 23:58:51 +02:00
David Williams
c8124097e3 Using a bit less memory. 2015-05-24 23:32:52 +02:00
David Williams
efb9844fe2 Merge branch 'develop' into feature/extractor-optimizations 2015-05-24 21:17:19 +02:00
David Williams
a34eda6250 Simple optimization. 2015-05-24 21:17:09 +02:00
David Williams
69349d95cd Tidying up. 2015-05-24 21:01:01 +02:00
David Williams
eb3727de30 Vastly simplified logic... hard to believe I made it so complicated :-) 2015-05-24 20:41:46 +02:00
David Williams
32df8be8da Tweaked conditions and comments. 2015-05-24 07:59:03 +02:00
David Williams
4e9b0e374b Moved code into outer loops. 2015-05-24 00:02:27 +02:00
David Williams
8e9e122c03 Merge branch 'develop' into feature/extractor-optimizations 2015-05-23 21:22:58 +02:00
David Williams
304e3d8f7a Faster tests when moving sampler. 2015-05-23 21:22:29 +02:00
David Williams
cee15a145f Avoid setting the sampler position every iteration. 2015-05-23 17:45:16 +02:00
David Williams
5b84c5a9a5 Removed unneeded call to setPosition(). 2015-05-23 17:23:59 +02:00
David Williams
762c9a5090 Switched 3D array back to two 2D arrays to reduce memory usage. 2015-05-22 16:48:42 +02:00
David Williams
50cf939e8a Reorganizing code. 2015-05-22 16:15:53 +02:00
David Williams
50a8bebfa9 Removed unneeded logic. 2015-05-21 23:31:19 +02:00
David Williams
711c262004 Skip outputting some indices. 2015-05-21 23:17:49 +02:00
David Williams
2a7eb51653 Refactoring multiple loops into one big loop. 2015-05-21 23:12:38 +02:00
David Williams
b19de819e2 Fixed compile error due to logging code changing scope. 2015-05-21 10:29:39 +02:00
David Williams
797689acea Trying to re-apply some previous optimizations to get old speed back. 2015-05-20 23:45:22 +02:00
David Williams
f178dc084b Updated unit tests. It seems we had a bug which was causing an excessive number of vertices to be generated. Not sure exactly what was wrong by the refactoring has fixed this. However, it still needs testing in Cubiquity to verify. 2015-05-19 23:14:31 +02:00
David Williams
9a68582530 Added bounds checks 2015-05-17 11:47:52 +02:00
David Williams
ccb76bc6d7 More work refactoring code. Examples appear to work now but tests still fail. 2015-05-17 09:52:13 +02:00
David Williams
a39b7f6a9f More refactoring. 2015-05-16 20:48:15 +02:00
David Williams
1a1ae75766 More refactoring. 2015-05-16 15:36:39 +02:00
David Williams
0e8c90c6ee More refactoring... 2015-05-16 09:00:04 +02:00
David Williams
227b11a764 Cleared array. 2015-05-15 10:03:29 +02:00
David Williams
b4267b11f5 More refactoring code. 2015-05-15 09:57:32 +02:00
David Williams
71adc7292c Restructuring code. 2015-05-14 22:10:37 +02:00
David Williams
89508f8b2b Restructuring code. 2015-05-14 11:48:28 +02:00
David Williams
f53efa1d64 Restructuring code. 2015-05-14 11:41:16 +02:00
David Williams
e912950317 Restructuring code... 2015-05-14 11:35:04 +02:00
David Williams
49683b4b48 Fixed compile error due to logging code changing scope. 2015-05-14 11:27:19 +02:00
David Williams
54f235e09a Restructuring computeBitmask code. 2015-05-14 11:14:39 +02:00
David Williams
5974a1de9b Restructuring loops... 2015-05-14 10:52:07 +02:00
David Williams
13fc8c5ba9 Removed unneeded variable. 2015-05-14 07:42:04 +02:00
David Williams
c4ce66dec5 Replaced 2D pPreviousBitmask and pCurrentBitmask with 3D pBitmask. 2015-05-14 07:15:36 +02:00
David Williams
2b22213bec Replaced 2D arrays with single 3D array when tracking existing vertices. 2015-05-13 23:05:58 +02:00
David Williams
5ce0d9c3e0 Cutting down and simplifying Marching Cubes code (also now slower...). 2015-05-10 19:43:09 +02:00
David Williams
3937dc3c61 Applying test to a larger region so we can more easily benchmark the performance (otherwise the VS profiler can fail if the test runs too quickly). 2015-05-10 11:40:58 +02:00
David Williams
16fca2529b Moved Config.h out of the 'Impl' folder. It should probably be considered part of the public API as users may want to adjust it for their purposes. 2015-05-09 08:58:14 +02:00
David Williams
65b0d1c3c5 Moved parts of the logging code into the public API (so users can redirect logs). 2015-05-09 08:52:30 +02:00
David Williams
040dc37057 Changed header guards. 2015-05-08 21:19:39 +02:00
David Williams
c2bb64d055 Renamed Logging.h to LoggingImpl.h
Added missing files to CMakeLists.txt
2015-05-08 21:18:10 +02:00
David Williams
09253a7bcc Removed a few uses of '#ifdef SWIG', mainly from areas where they would no longer work. e.g where the code has been templatized since the #ifdef was added so we can see that the SWIG version of the code is out of date and won't build anyway. 2015-05-08 21:08:43 +02:00