|
|
4ae25d6b1e
|
More commenting.
|
2014-05-26 16:50:13 +02:00 |
|
|
|
e9c8daa9cb
|
Add comments and tidying.
|
2014-05-26 16:31:12 +02:00 |
|
|
|
2a072f9347
|
Rearranged some functions.
|
2014-05-25 23:44:37 +02:00 |
|
|
|
9e835a1110
|
Shader now passed by shared pointer.
|
2014-05-25 23:40:55 +02:00 |
|
|
|
b97bf52214
|
Tidying up.
|
2014-05-25 23:34:12 +02:00 |
|
|
|
ec08b28002
|
Turned off back-face culling in examples, as this makes it easier to view certain shapes such as heightmaps.
|
2014-05-25 21:45:28 +02:00 |
|
|
|
499db6a185
|
Changed default shader to use normal as RGB (more useful for debugging).
|
2014-05-25 21:43:37 +02:00 |
|
|
|
22869e4861
|
More tweaks to scaling and translation.
|
2014-05-25 21:36:41 +02:00 |
|
|
|
b63a09cab3
|
Changing the way the examples handle translation and scaling.
|
2014-05-25 21:29:44 +02:00 |
|
|
|
6738c4fc9e
|
Smooth example now also uses new example OpenGLWidget.
|
2014-05-25 21:15:20 +02:00 |
|
|
|
349dc2b0e6
|
Centered volume in viewport.
|
2014-05-25 21:06:44 +02:00 |
|
|
|
e80c88a5ec
|
Paging example now uses the new example OpenGLWidget.
|
2014-05-25 21:03:52 +02:00 |
|
|
|
eb39f0bb4c
|
OpenGLExample is once again rendered as multiple separate mehses (but using the example framework this time).
|
2014-05-25 12:28:45 +02:00 |
|
|
|
f78aad8abd
|
Fixed colors to match previous version of the example.
|
2014-05-24 22:58:31 +02:00 |
|
|
|
99cf75e902
|
Material now passed to shader as integer rather than float.
|
2014-05-24 22:53:10 +02:00 |
|
|
|
07b9cf05fa
|
Changed OpenGLExample to use MaterialDensityPair88 instead of MaterialDensityPair44.
Added material to shaders.
|
2014-05-24 21:09:26 +02:00 |
|
|
|
aace1f2e36
|
Exposing normals to example framework.
|
2014-05-24 09:38:01 +02:00 |
|
|
|
f65edddd81
|
Tidying up.
|
2014-05-24 08:38:18 +02:00 |
|
|
|
6cbb2d44bf
|
Work on making OpenGLExample work with common example framework.
|
2014-05-23 22:44:58 +02:00 |
|
|
|
34f57911a7
|
Converting OpenGLExample to use common OpenGLWidget.
|
2014-05-23 22:18:17 +02:00 |
|
|
|
d34fd6b3c8
|
Moved OpenGLWidget into common folder so it can be used by other examples.
|
2014-05-23 22:11:47 +02:00 |
|
|
|
4f7e1e6846
|
Each mesh now has it's own transform matrix applied, so that our example framework can support breaking a volume into regions.
|
2014-05-23 22:03:57 +02:00 |
|
|
|
9f5b2e1659
|
Better templatization of addMesh.
|
2014-05-23 17:02:46 +02:00 |
|
|
|
37bdf8e3ac
|
Templatised code for example mesh conversion.
|
2014-05-23 16:26:56 +02:00 |
|
|
|
79acf814db
|
Revert "Compile fixes for VS2012"
This reverts commit e8313a683b.
|
2014-05-23 16:11:53 +02:00 |
|
|
|
e8313a683b
|
Compile fixes for VS2012
|
2014-05-23 15:32:28 +02:00 |
|
|
|
4aae00e4a8
|
Renamed SurfaceMesh to just Mesh
|
2014-05-23 15:17:07 +02:00 |
|
|
|
da8f294847
|
Comments
|
2014-05-23 14:37:35 +02:00 |
|
|
|
4cec89de38
|
Added ability to specify the visible region so that the example framework can support different volume sizes.
|
2014-05-23 14:32:46 +02:00 |
|
|
|
ab741583e4
|
Renamed extractXxxSurface() to extractXxxMesh()
|
2014-05-22 23:26:40 +02:00 |
|
|
|
f8ce3a5f3d
|
Tidying camera code.
|
2014-05-22 17:03:06 +02:00 |
|
|
|
16cbb94d90
|
Rotation is now applied by moving the camera rather than the meshes.
|
2014-05-22 16:51:41 +02:00 |
|
|
|
7d55e00f76
|
More work adding support for multiple meshes.
|
2014-05-22 16:38:02 +02:00 |
|
|
|
51e93fdabc
|
Modifying the OpenGLWidget so that it can render multiple meshes.
|
2014-05-22 16:25:36 +02:00 |
|
|
|
7fc954a6bf
|
Fix SWIG include paths for C# bindings
|
2014-05-20 14:43:18 +01:00 |
|
|
|
ef61480c3d
|
Merge branch 'feature/vertex-refactor' into develop
|
2014-05-12 23:08:27 +02:00 |
|
|
|
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 |
|
|
|
1e0b8e97eb
|
Merge branch 'feature/extractor-refactor' into develop
|
2014-05-12 21:13:26 +02:00 |
|
|
|
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 |
|
|
|
5191c3c068
|
Merge branch 'develop' into feature/extractor-refactor
|
2014-05-11 20:35:44 +02:00 |
|
|
|
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 |
|
|
|
1bff5c207c
|
Merge branch 'feature/cubiquity-version' of https://bitbucket.org/volumesoffun/polyvox.git into develop
|
2014-05-11 19:47:05 +02:00 |
|
|
|
217aa93720
|
Test now uses free-function surface extractor.
|
2014-05-11 16:41:52 +02:00 |
|
|
|
95a3e2e9ce
|
Smooth LOD example now uses free function surface extractor.
|
2014-05-11 16:29:51 +02:00 |
|
|
|
347028199c
|
Paging example now also uses free-function surface extractor.
|
2014-05-11 16:27:38 +02:00 |
|
|
|
a51eaa4a02
|
Merge branch 'develop' of https://bitbucket.org/volumesoffun/polyvox into feature/extractor-refactor
Conflicts:
examples/Basic/main.cpp
|
2014-05-11 16:21:37 +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 |
|
|
|
ae87dbee77
|
Fixed materials in OpenGL example.
|
2014-05-08 16:40:27 +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 |
|
