Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2013-11-28 03:13:32 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2013-11-28 05:11:42 +0400
commit731ffd3cd4c1d578fb02d39dc512bace850c2e8b (patch)
tree63cced11229d028a2d8a7e5b6c9600e4e0fa6351 /intern/cycles/subd/subd_patch.h
parentaf7a2a3b6a08bdbe99d295e593e770af165eb0e6 (diff)
Cycles: remove approximate subdivision surface with gregory patches code.
It was never fully implemented and will be replaced by OpenSubdiv. Only linear subdivision remains now. Also includes some refactoring in the split/dice code, adding a SubdParams struct to pass around parameters more easily.
Diffstat (limited to 'intern/cycles/subd/subd_patch.h')
-rw-r--r--intern/cycles/subd/subd_patch.h39
1 files changed, 1 insertions, 38 deletions
diff --git a/intern/cycles/subd/subd_patch.h b/intern/cycles/subd/subd_patch.h
index 7755740ea0c..b851fef16ae 100644
--- a/intern/cycles/subd/subd_patch.h
+++ b/intern/cycles/subd/subd_patch.h
@@ -22,15 +22,11 @@
CCL_NAMESPACE_BEGIN
-class Mesh;
-
-/* Base */
-
class Patch {
public:
virtual ~Patch() {}
virtual void eval(float3 *P, float3 *dPdu, float3 *dPdv, float u, float v) = 0;
- virtual bool is_triangle() = 0;
+ virtual bool is_triangle() { return false; }
virtual BoundBox bound() = 0;
};
@@ -67,39 +63,6 @@ public:
BoundBox bound();
};
-/* Bicubic Patch with Tangent Fields */
-
-class BicubicTangentPatch : public Patch {
-public:
- float3 hull[16];
- float3 utan[12];
- float3 vtan[12];
-
- void eval(float3 *P, float3 *dPdu, float3 *dPdv, float u, float v);
- bool is_triangle() { return false; }
- BoundBox bound();
-};
-
-/* Gregory Patches */
-
-class GregoryQuadPatch : public Patch {
-public:
- float3 hull[20];
-
- void eval(float3 *P, float3 *dPdu, float3 *dPdv, float u, float v);
- bool is_triangle() { return false; }
- BoundBox bound();
-};
-
-class GregoryTrianglePatch : public Patch {
-public:
- float3 hull[20];
-
- void eval(float3 *P, float3 *dPdu, float3 *dPdv, float u, float v);
- bool is_triangle() { return true; }
- BoundBox bound();
-};
-
CCL_NAMESPACE_END
#endif /* __SUBD_PATCH_H__ */