archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.
Files
1004b03578302da08b656cad5051ee1652883920
blender-archive/source/blender/blenkernel/intern/CCGSubSurf.c

3014 lines
81 KiB
C
Raw Normal View History

header cleanup (no functional changes)
2011-10-10 09:38:02 +00:00
doxygen: blender/blenkernel tagged.
2011-02-27 20:40:57 +00:00
/** \file blender/blenkernel/intern/CCGSubSurf.c
* \ingroup bke
*/
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
#include <stdlib.h>
#include <string.h>
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
#include <math.h>
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
#include "CCGSubSurf.h"
Fix for a memory leak in subsurf code that is using memory arena, temporary arrays are now allocated with regular guardedalloc.
2010-02-08 15:01:11 +00:00
#include "MEM_guardedalloc.h"
Win64: please check my changes if you ran across them ;) But should be fine since no additional crashes were reported!
2008-08-17 17:08:00 +00:00
#include "BLO_sys_types.h" // for intptr_t support
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
#include "BLI_utildefines.h" /* for BLI_assert */
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
#ifdef _MSC_VER
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
# define CCG_INLINE __inline
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
#else
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
# define CCG_INLINE inline
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
#endif
- fixed remaining unused warnings. - omit render code from this warning (cmake only), until render branch is merged. - moved -Wunused-parameter warning to apply to all C code in blender (not just ./source/blender), (cmake only).
2010-10-17 06:38:56 +00:00
/* copied from BKE_utildefines.h ugh */
#ifdef __GNUC__
# define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
#else
# define UNUSED(x) x
#endif
sintel's normals were rendering black around her eye. Subsurf FLT_EPSILON from float.h was too high, using a smaller value fixes
2009-11-12 15:05:51 +00:00
/* used for normalize_v3 in BLI_math_vector
* float.h's FLT_EPSILON causes trouble with subsurf normals - campbell */
#define EPSILON (1.0e-35f)
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
/***/
typedef unsigned char byte;
/***/
static int kHashSizes[] = {
1, 3, 5, 11, 17, 37, 67, 131, 257, 521, 1031, 2053, 4099, 8209,
16411, 32771, 65537, 131101, 262147, 524309, 1048583, 2097169,
4194319, 8388617, 16777259, 33554467, 67108879, 134217757, 268435459
};
typedef struct _EHEntry EHEntry;
struct _EHEntry {
EHEntry *next;
void *key;
};
typedef struct _EHash {
EHEntry **buckets;
int numEntries, curSize, curSizeIdx;
CCGAllocatorIFC allocatorIFC;
CCGAllocatorHDL allocator;
} EHash;
#define EHASH_alloc(eh, nb) ((eh)->allocatorIFC.alloc((eh)->allocator, nb))
#define EHASH_free(eh, ptr) ((eh)->allocatorIFC.free((eh)->allocator, ptr))
Win64: please check my changes if you ran across them ;) But should be fine since no additional crashes were reported!
2008-08-17 17:08:00 +00:00
#define EHASH_hash(eh, item) (((uintptr_t) (item))%((unsigned int) (eh)->curSize))
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static EHash *_ehash_new(int estimatedNumEntries, CCGAllocatorIFC *allocatorIFC, CCGAllocatorHDL allocator)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
EHash *eh = allocatorIFC->alloc(allocator, sizeof(*eh));
eh->allocatorIFC = *allocatorIFC;
eh->allocator = allocator;
eh->numEntries = 0;
eh->curSizeIdx = 0;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
while (kHashSizes[eh->curSizeIdx] < estimatedNumEntries)
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
eh->curSizeIdx++;
eh->curSize = kHashSizes[eh->curSizeIdx];
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
eh->buckets = EHASH_alloc(eh, eh->curSize * sizeof(*eh->buckets));
memset(eh->buckets, 0, eh->curSize * sizeof(*eh->buckets));
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return eh;
}
typedef void (*EHEntryFreeFP)(EHEntry *, void *);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void _ehash_free(EHash *eh, EHEntryFreeFP freeEntry, void *userData)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
int numBuckets = eh->curSize;
while (numBuckets--) {
EHEntry *entry = eh->buckets[numBuckets];
while (entry) {
EHEntry *next = entry->next;
freeEntry(entry, userData);
entry = next;
}
}
EHASH_free(eh, eh->buckets);
EHASH_free(eh, eh);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void _ehash_insert(EHash *eh, EHEntry *entry)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
int numBuckets = eh->curSize;
int hash = EHASH_hash(eh, entry->key);
entry->next = eh->buckets[hash];
eh->buckets[hash] = entry;
eh->numEntries++;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (eh->numEntries > (numBuckets * 3)) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
EHEntry **oldBuckets = eh->buckets;
eh->curSize = kHashSizes[++eh->curSizeIdx];
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
eh->buckets = EHASH_alloc(eh, eh->curSize * sizeof(*eh->buckets));
memset(eh->buckets, 0, eh->curSize * sizeof(*eh->buckets));
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
while (numBuckets--) {
for (entry = oldBuckets[numBuckets]; entry;) {
EHEntry *next = entry->next;
hash = EHASH_hash(eh, entry->key);
entry->next = eh->buckets[hash];
eh->buckets[hash] = entry;
entry = next;
}
}
EHASH_free(eh, oldBuckets);
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void *_ehash_lookupWithPrev(EHash *eh, void *key, void ***prevp_r)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
int hash = EHASH_hash(eh, key);
- fix warnings for gcc - some subsurf settings not correctly changed in editmode
2005-03-31 16:08:29 +00:00
void **prevp = (void**) &eh->buckets[hash];
- more warning removal/cleanup for CCG, apparently GCC is not happy about coercing (xxx**) to (void**) (sadly enough)
2005-03-27 14:37:00 +00:00
EHEntry *entry;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
- fix warnings for gcc - some subsurf settings not correctly changed in editmode
2005-03-31 16:08:29 +00:00
for (; (entry = *prevp); prevp = (void**) &entry->next) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (entry->key == key) {
- more warning removal/cleanup for CCG, apparently GCC is not happy about coercing (xxx**) to (void**) (sadly enough)
2005-03-27 14:37:00 +00:00
*prevp_r = (void**) prevp;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return entry;
}
}
return NULL;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void *_ehash_lookup(EHash *eh, void *key)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
int hash = EHASH_hash(eh, key);
EHEntry *entry;
for (entry = eh->buckets[hash]; entry; entry = entry->next)
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (entry->key == key)
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
break;
return entry;
}
/**/
typedef struct _EHashIterator {
EHash *eh;
int curBucket;
EHEntry *curEntry;
} EHashIterator;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static EHashIterator *_ehashIterator_new(EHash *eh)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
EHashIterator *ehi = EHASH_alloc(eh, sizeof(*ehi));
ehi->eh = eh;
ehi->curEntry = NULL;
ehi->curBucket = -1;
while (!ehi->curEntry) {
ehi->curBucket++;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (ehi->curBucket == ehi->eh->curSize)
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
break;
ehi->curEntry = ehi->eh->buckets[ehi->curBucket];
}
return ehi;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void _ehashIterator_free(EHashIterator *ehi)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
EHASH_free(ehi->eh, ehi);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void *_ehashIterator_getCurrent(EHashIterator *ehi)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return ehi->curEntry;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void _ehashIterator_next(EHashIterator *ehi)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (ehi->curEntry) {
spaces -> tabs, (4 spaces == 1 tab, only for white space preceding text)
2010-03-22 09:30:00 +00:00
ehi->curEntry = ehi->curEntry->next;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
while (!ehi->curEntry) {
ehi->curBucket++;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (ehi->curBucket == ehi->eh->curSize)
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
break;
ehi->curEntry = ehi->eh->buckets[ehi->curBucket];
}
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static int _ehashIterator_isStopped(EHashIterator *ehi)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return !ehi->curEntry;
}
/***/
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void *_stdAllocator_alloc(CCGAllocatorHDL UNUSED(a), int numBytes)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return malloc(numBytes);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void *_stdAllocator_realloc(CCGAllocatorHDL UNUSED(a), void *ptr, int newSize, int UNUSED(oldSize))
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return realloc(ptr, newSize);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void _stdAllocator_free(CCGAllocatorHDL UNUSED(a), void *ptr)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
free(ptr);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static CCGAllocatorIFC *_getStandardAllocatorIFC(void)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
static CCGAllocatorIFC ifc;
ifc.alloc = _stdAllocator_alloc;
ifc.realloc = _stdAllocator_realloc;
ifc.free = _stdAllocator_free;
ifc.release = NULL;
return &ifc;
}
/***/
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
static int ccg_gridsize(int level)
{
BLI_assert(level > 0);
BLI_assert(level <= 31);
return (1 << (level - 1)) + 1;
}
static int ccg_edgesize(int level)
{
BLI_assert(level > 0);
BLI_assert(level <= 30);
return 1 + (1 << level);
}
static int ccg_spacing(int high_level, int low_level)
{
BLI_assert(high_level > 0 && low_level > 0);
BLI_assert(high_level >= low_level);
BLI_assert((high_level - low_level) <= 30);
return 1 << (high_level - low_level);
}
static int ccg_edgebase(int level)
{
BLI_assert(level > 0);
BLI_assert(level <= 30);
return level + (1 << level) - 1;
}
/***/
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static int VertDataEqual(const float *a, const float *b)
{
return a[0] == b[0] && a[1] == b[1] && a[2] == b[2];
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
#define VertDataZero(av) { float *_a = (float *)av; _a[0] = _a[1] = _a[2] = 0.0f; }
#define VertDataCopy(av, bv) { float *_a = (float *)av, *_b = (float *) bv; _a[0] = _b[0]; _a[1] = _b[1]; _a[2] = _b[2]; }
#define VertDataAdd(av, bv) { float *_a = (float *)av, *_b = (float *) bv; _a[0] += _b[0]; _a[1] += _b[1]; _a[2] += _b[2]; }
#define VertDataSub(av, bv) { float *_a = (float *)av, *_b = (float *) bv; _a[0] -= _b[0]; _a[1] -= _b[1]; _a[2] -= _b[2]; }
#define VertDataMulN(av, n) { float *_a = (float *)av; _a[0]*=n; _a[1]*=n; _a[2] *=n; }
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
#define VertDataAvg4(tv, av, bv, cv, dv) \
{ \
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
float *_t = (float *) tv, *_a = (float *) av, *_b = (float *) bv, *_c = (float *) cv, *_d = (float *) dv; \
_t[0] = (_a[0] + _b[0] + _c[0] + _d[0]) * 0.25f; \
_t[1] = (_a[1] + _b[1] + _c[1] + _d[1]) * 0.25f; \
_t[2] = (_a[2] + _b[2] + _c[2] + _d[2]) * 0.25f; \
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
#define NormZero(av) { float *_a = (float *) av; _a[0] = _a[1] = _a[2] = 0.0f; }
#define NormCopy(av, bv) { float *_a = (float *) av, *_b = (float *) bv; _a[0] = _b[0]; _a[1] = _b[1]; _a[2] = _b[2]; }
#define NormAdd(av, bv) { float *_a = (float *) av, *_b = (float *) bv; _a[0] += _b[0]; _a[1] += _b[1]; _a[2] += _b[2]; }
- bug fix, vertex normal calculation during incremental update was not correct (although fairly unnoticable). - bug fix, vertex normal calculation didn't normalize face normals before summing... silly mistake p.s. perhaps the Crystal Space bla bla naming conversation is not most appropriate for the commit list?
2005-06-23 23:44:22 +00:00
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
use 2d copy functions with UV's in more places.
2011-12-17 03:46:38 +00:00
static int _edge_isBoundary(const CCGEdge *e);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
/***/
clear some unused warnings
2011-02-17 12:05:09 +00:00
enum {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
Vert_eEffected = (1 << 0),
Vert_eChanged = (1 << 1),
Vert_eSeam = (1 << 2)
clear some unused warnings
2011-02-17 12:05:09 +00:00
} /*VertFlags*/;
enum {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
Edge_eEffected = (1 << 0)
clear some unused warnings
2011-02-17 12:05:09 +00:00
} /*CCGEdgeFlags*/;
enum {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
Face_eEffected = (1 << 0)
clear some unused warnings
2011-02-17 12:05:09 +00:00
} /*FaceFlags*/;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
struct _CCGVert {
CCGVert *next; /* EHData.next */
CCGVertHDL vHDL; /* EHData.key */
short numEdges, numFaces, flags, pad;
CCGEdge **edges;
CCGFace **faces;
// byte *levelData;
// byte *userData;
};
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
#define VERT_getLevelData(v) ((byte *) &(v)[1])
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
struct _CCGEdge {
CCGEdge *next; /* EHData.next */
CCGEdgeHDL eHDL; /* EHData.key */
short numFaces, flags;
- take out compile time conditional behavior of creasing for ccg subsurf (always on) - bug fix, creasing wasn't evaluated properly after incremental change
2005-04-01 02:07:34 +00:00
float crease;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGVert *v0,*v1;
CCGFace **faces;
// byte *levelData;
// byte *userData;
};
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
#define EDGE_getLevelData(e) ((byte *) &(e)[1])
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
struct _CCGFace {
CCGFace *next; /* EHData.next */
CCGFaceHDL fHDL; /* EHData.key */
short numVerts, flags, pad1, pad2;
// CCGVert **verts;
// CCGEdge **edges;
// byte *centerData;
// byte **gridData;
// byte *userData;
};
#define FACE_getVerts(f) ((CCGVert**) &(f)[1])
#define FACE_getEdges(f) ((CCGEdge**) &(FACE_getVerts(f)[(f)->numVerts]))
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
#define FACE_getCenterData(f) ((byte *) &(FACE_getEdges(f)[(f)->numVerts]))
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
typedef enum {
eSyncState_None = 0,
eSyncState_Vert,
eSyncState_Edge,
eSyncState_Face,
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
eSyncState_Partial
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
} SyncState;
struct _CCGSubSurf {
EHash *vMap; /* map of CCGVertHDL -> Vert */
EHash *eMap; /* map of CCGEdgeHDL -> Edge */
EHash *fMap; /* map of CCGFaceHDL -> Face */
CCGMeshIFC meshIFC;
- shuffled editmesh derived function name/function - added ModifierTypeInfo.freeData function - added modifier_{new,free] utility function - added ccgSubSurf_getUseAgeCounts to query info - removed subsurf modifier faking (ME_SUBSURF flag is no longer valid). subsurf modifier gets converted on file load although there is obscure linked mesh situation where this can go wrong, will fix shortly. this also means that some places in the code that test/copy subsurf settings are broken for the time being. - shuffled modifier calculation to be simpler. note that all modifiers are currently disabled in editmode (including subsurf). don't worry, will return shortly. - bug fix, build modifier didn't randomize meshes with only verts - cleaned up subsurf_ccg and adapted for future editmode modifier work - added editmesh.derived{Cage,Final}, not used yet - added SubsurfModifierData.{mCache,emCache}, will be used to cache subsurf instead of caching in derivedmesh itself - removed old subsurf buttons - added do_modifiers_buttons to handle modifier events - removed count_object counting of modifier (subsurfed) objects... this would be nice to add back at some point but requires care. probably requires rewrite of counting system. New feature: Incremental Subsurf in Object Mode The previous release introduce incremental subsurf calculation during editmode but it was not turned on during object mode. In general it does not make sense to have it always enabled during object mode because it requires caching a fair amount of information about the mesh which is a waste of memory unless the mesh is often recalculated. However, for mesh's that have subsurfed armatures for example, or that have other modifiers so that the mesh is essentially changing on every frame, it makes a lot of sense to keep the subsurf'd object around and that is what the new incremental subsurf modifier toggle is for. The intent is that the user will enable this option for (a) a mesh that is currently under active editing or (b) a mesh that is heavily updated in the scene, such as a character. I will try to write more about this feature for release, because it has advantages and disadvantages that are not immediately obvious (the first user reaction will be to turn it on for ever object, which is probably not correct).
2005-07-21 20:30:33 +00:00
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGAllocatorIFC allocatorIFC;
CCGAllocatorHDL allocator;
int subdivLevels;
int numGrids;
int allowEdgeCreation;
- kinda crazy, but replaced old ME_SIMPLE_SUBDIV method with just using regular ccgsubsurf but with crease set to full.
2005-04-04 02:55:56 +00:00
float defaultCreaseValue;
- made make_edge mark edges with LOOSEEDGE appropriately - added user settable defaultEdgeData (for auto edge creation in CCGSubSurf) - bug fix, possible crash on meshes with loose edges but in mface not in medge - missed file in last commit, for proper updating in image window
2005-08-20 09:16:09 +00:00
void *defaultEdgeUserData;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
void *q, *r;
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
// data for calc vert normals
int calcVertNormals;
int normalDataOffset;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
// data for age'ing (to debug sync)
int currentAge;
int useAgeCounts;
int vertUserAgeOffset;
int edgeUserAgeOffset;
int faceUserAgeOffset;
// data used during syncing
SyncState syncState;
EHash *oldVMap, *oldEMap, *oldFMap;
int lenTempArrays;
CCGVert **tempVerts;
CCGEdge **tempEdges;
};
#define CCGSUBSURF_alloc(ss, nb) ((ss)->allocatorIFC.alloc((ss)->allocator, nb))
#define CCGSUBSURF_realloc(ss, ptr, nb, ob) ((ss)->allocatorIFC.realloc((ss)->allocator, ptr, nb, ob))
#define CCGSUBSURF_free(ss, ptr) ((ss)->allocatorIFC.free((ss)->allocator, ptr))
/***/
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static CCGVert *_vert_new(CCGVertHDL vHDL, CCGSubSurf *ss)
{
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
int num_vert_data = ss->subdivLevels + 1;
CCGVert *v = CCGSUBSURF_alloc(ss,
sizeof(CCGVert) +
ss->meshIFC.vertDataSize * num_vert_data +
ss->meshIFC.vertUserSize);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
byte *userData;
v->vHDL = vHDL;
v->edges = NULL;
v->faces = NULL;
v->numEdges = v->numFaces = 0;
v->flags = 0;
userData = ccgSubSurf_getVertUserData(ss, v);
memset(userData, 0, ss->meshIFC.vertUserSize);
if (ss->useAgeCounts) *((int*) &userData[ss->vertUserAgeOffset]) = ss->currentAge;
return v;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void _vert_remEdge(CCGVert *v, CCGEdge *e)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
int i;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < v->numEdges; i++) {
if (v->edges[i] == e) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
v->edges[i] = v->edges[--v->numEdges];
break;
}
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void _vert_remFace(CCGVert *v, CCGFace *f)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
int i;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < v->numFaces; i++) {
if (v->faces[i] == f) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
v->faces[i] = v->faces[--v->numFaces];
break;
}
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void _vert_addEdge(CCGVert *v, CCGEdge *e, CCGSubSurf *ss)
{
v->edges = CCGSUBSURF_realloc(ss, v->edges, (v->numEdges + 1) * sizeof(*v->edges), v->numEdges * sizeof(*v->edges));
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
v->edges[v->numEdges++] = e;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void _vert_addFace(CCGVert *v, CCGFace *f, CCGSubSurf *ss)
{
v->faces = CCGSUBSURF_realloc(ss, v->faces, (v->numFaces + 1) * sizeof(*v->faces), v->numFaces * sizeof(*v->faces));
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
v->faces[v->numFaces++] = f;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static CCGEdge *_vert_findEdgeTo(const CCGVert *v, const CCGVert *vQ)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
int i;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < v->numEdges; i++) {
CCGEdge *e = v->edges[v->numEdges - 1 - i]; // XXX, note reverse
if ((e->v0 == v && e->v1 == vQ) ||
(e->v1 == v && e->v0 == vQ))
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return e;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
fix for warnings from Sparse static source code checker, mostly BKE/BLI and python functions. - use NULL rather then 0 where possible (makes code & function calls more readable IMHO). - set static variables and functions (exposed some unused vars/funcs). - use func(void) rather then func() for definitions.
2011-02-13 10:52:18 +00:00
return NULL;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static int _vert_isBoundary(const CCGVert *v)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
int i;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < v->numEdges; i++)
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (_edge_isBoundary(v->edges[i]))
return 1;
return 0;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void *_vert_getCo(CCGVert *v, int lvl, int dataSize)
{
return &VERT_getLevelData(v)[lvl * dataSize];
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static float *_vert_getNo(CCGVert *v, int lvl, int dataSize, int normalDataOffset)
{
return (float *) &VERT_getLevelData(v)[lvl * dataSize + normalDataOffset];
- change modifier applyModifier[EM] function to not free derived argument - added modifier_supportsMapping function - update CCG to set actual vertex normal (and not just interior face vertex normal, bla bla bla no one knows what this means nevermind). - renamed modifierType_get_info to modifierType_getInfo for consistency and to increase my commit line count. - update EditMeshDerivedMesh to calculate (and use new) normals when given deformed vertices - added - update editmode modifier calculation to also calculate a cage, not working 100% atm, in particular if a deformer follows a modifier that returns a DerivedMesh the cage is not accurate. - added ccg derivedmesh drawMapped{Vert,Face]NormalsEM functions - currently UI for selecting the cage mesh is rather irritating, will be updated
2005-08-03 04:04:05 +00:00
}
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void _vert_free(CCGVert *v, CCGSubSurf *ss)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGSUBSURF_free(ss, v->edges);
CCGSUBSURF_free(ss, v->faces);
CCGSUBSURF_free(ss, v);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static int VERT_seam(const CCGVert *v)
{
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
return ((v->flags & Vert_eSeam) != 0);
}
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
/***/
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static CCGEdge *_edge_new(CCGEdgeHDL eHDL, CCGVert *v0, CCGVert *v1, float crease, CCGSubSurf *ss)
{
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
int num_edge_data = ccg_edgebase(ss->subdivLevels + 1);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGEdge *e = CCGSUBSURF_alloc(ss,
sizeof(CCGEdge) +
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
ss->meshIFC.vertDataSize * num_edge_data +
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
ss->meshIFC.edgeUserSize);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
byte *userData;
e->eHDL = eHDL;
e->v0 = v0;
e->v1 = v1;
- take out compile time conditional behavior of creasing for ccg subsurf (always on) - bug fix, creasing wasn't evaluated properly after incremental change
2005-04-01 02:07:34 +00:00
e->crease = crease;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
e->faces = NULL;
e->numFaces = 0;
e->flags = 0;
_vert_addEdge(v0, e, ss);
_vert_addEdge(v1, e, ss);
userData = ccgSubSurf_getEdgeUserData(ss, e);
memset(userData, 0, ss->meshIFC.edgeUserSize);
if (ss->useAgeCounts) *((int*) &userData[ss->edgeUserAgeOffset]) = ss->currentAge;
return e;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void _edge_remFace(CCGEdge *e, CCGFace *f)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
int i;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < e->numFaces; i++) {
if (e->faces[i] == f) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
e->faces[i] = e->faces[--e->numFaces];
break;
}
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void _edge_addFace(CCGEdge *e, CCGFace *f, CCGSubSurf *ss)
{
e->faces = CCGSUBSURF_realloc(ss, e->faces, (e->numFaces + 1) * sizeof(*e->faces), e->numFaces * sizeof(*e->faces));
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
e->faces[e->numFaces++] = f;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static int _edge_isBoundary(const CCGEdge *e)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return e->numFaces<2;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static CCGVert *_edge_getOtherVert(CCGEdge *e, CCGVert *vQ)
{
if (vQ == e->v0) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return e->v1;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return e->v0;
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void *_edge_getCo(CCGEdge *e, int lvl, int x, int dataSize)
{
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
int levelBase = ccg_edgebase(lvl);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
return &EDGE_getLevelData(e)[dataSize * (levelBase + x)];
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static float *_edge_getNo(CCGEdge *e, int lvl, int x, int dataSize, int normalDataOffset)
{
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
int levelBase = ccg_edgebase(lvl);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
return (float *) &EDGE_getLevelData(e)[dataSize * (levelBase + x) + normalDataOffset];
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void *_edge_getCoVert(CCGEdge *e, CCGVert *v, int lvl, int x, int dataSize)
{
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
int levelBase = ccg_edgebase(lvl);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (v == e->v0) {
return &EDGE_getLevelData(e)[dataSize * (levelBase + x)];
}
else {
return &EDGE_getLevelData(e)[dataSize * (levelBase + (1 << lvl) - x)];
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void _edge_free(CCGEdge *e, CCGSubSurf *ss)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGSUBSURF_free(ss, e->faces);
CCGSUBSURF_free(ss, e);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void _edge_unlinkMarkAndFree(CCGEdge *e, CCGSubSurf *ss)
{
resolve some compiler warnings with intel c/c++ compiler * subsurf code had a lot of unused variables, removed these where they are obviously not needed. commented if they could be useful later. * some variables declorations hide existing variables (many of these left), but fixed some that could cause confusion. * removed unused vars * obscure python memory leak with colorband. * make_sample_tables had a loop running wasnt used. * if 0'd functions in arithb.c that are not used yet. * made many functions static
2008-09-29 17:08:11 +00:00
_vert_remEdge(e->v0, e);
_vert_remEdge(e->v1, e);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
e->v0->flags |= Vert_eEffected;
e->v1->flags |= Vert_eEffected;
_edge_free(e, ss);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static float EDGE_getSharpness(CCGEdge *e, int lvl)
{
subsurfs EDGE_getSharpness function was looping when it didnt need to and also took an unused value. removed loop and unused var, since this is a sensitive (and not my) area - I did some mesh comparisons and ran a comparison with the old function passing random values, so this should be ok.
2007-06-09 10:51:02 +00:00
if (!lvl)
return e->crease;
else if (!e->crease)
subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
2011-03-27 17:22:04 +00:00
return 0.0f;
else if (e->crease - lvl < 0.0f)
return 0.0f;
subsurfs EDGE_getSharpness function was looping when it didnt need to and also took an unused value. removed loop and unused var, since this is a sensitive (and not my) area - I did some mesh comparisons and ran a comparison with the old function passing random values, so this should be ok.
2007-06-09 10:51:02 +00:00
else
return e->crease - lvl;
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static CCGFace *_face_new(CCGFaceHDL fHDL, CCGVert **verts, CCGEdge **edges, int numVerts, CCGSubSurf *ss)
{
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
int maxGridSize = ccg_gridsize(ss->subdivLevels);
int num_face_data = (numVerts * maxGridSize +
numVerts * maxGridSize * maxGridSize + 1);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGFace *f = CCGSUBSURF_alloc(ss,
sizeof(CCGFace) +
sizeof(CCGVert*) * numVerts +
sizeof(CCGEdge*) * numVerts +
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
ss->meshIFC.vertDataSize * num_face_data +
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
ss->meshIFC.faceUserSize);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
byte *userData;
int i;
f->numVerts = numVerts;
f->fHDL = fHDL;
f->flags = 0;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numVerts; i++) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
FACE_getVerts(f)[i] = verts[i];
FACE_getEdges(f)[i] = edges[i];
_vert_addFace(verts[i], f, ss);
_edge_addFace(edges[i], f, ss);
}
userData = ccgSubSurf_getFaceUserData(ss, f);
memset(userData, 0, ss->meshIFC.faceUserSize);
if (ss->useAgeCounts) *((int*) &userData[ss->faceUserAgeOffset]) = ss->currentAge;
return f;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static CCG_INLINE void *_face_getIECo(CCGFace *f, int lvl, int S, int x, int levels, int dataSize)
{
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
int maxGridSize = ccg_gridsize(levels);
int spacing = ccg_spacing(levels, lvl);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
byte *gridBase = FACE_getCenterData(f) + dataSize * (1 + S * (maxGridSize + maxGridSize * maxGridSize));
return &gridBase[dataSize * x * spacing];
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static CCG_INLINE void *_face_getIENo(CCGFace *f, int lvl, int S, int x, int levels, int dataSize, int normalDataOffset)
{
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
int maxGridSize = ccg_gridsize(levels);
int spacing = ccg_spacing(levels, lvl);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
byte *gridBase = FACE_getCenterData(f) + dataSize * (1 + S * (maxGridSize + maxGridSize * maxGridSize));
return &gridBase[dataSize * x * spacing + normalDataOffset];
Fix #20505: subsurf normals where not being set correct on correct from subsurf derivedmesh to regular (derived)mesh, causing drawing errors on apply and following modifiers to work incorrect.
2010-01-30 09:32:05 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static CCG_INLINE void *_face_getIFCo(CCGFace *f, int lvl, int S, int x, int y, int levels, int dataSize)
{
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
int maxGridSize = ccg_gridsize(levels);
int spacing = ccg_spacing(levels, lvl);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
byte *gridBase = FACE_getCenterData(f) + dataSize * (1 + S * (maxGridSize + maxGridSize * maxGridSize));
return &gridBase[dataSize * (maxGridSize + (y * maxGridSize + x) * spacing)];
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static CCG_INLINE float *_face_getIFNo(CCGFace *f, int lvl, int S, int x, int y, int levels, int dataSize, int normalDataOffset)
{
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
int maxGridSize = ccg_gridsize(levels);
int spacing = ccg_spacing(levels, lvl);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
byte *gridBase = FACE_getCenterData(f) + dataSize * (1 + S * (maxGridSize + maxGridSize * maxGridSize));
return (float *) &gridBase[dataSize * (maxGridSize + (y * maxGridSize + x) * spacing) + normalDataOffset];
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static int _face_getVertIndex(CCGFace *f, CCGVert *v)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
int i;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < f->numVerts; i++)
if (FACE_getVerts(f)[i] == v)
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return i;
return -1;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static CCG_INLINE void *_face_getIFCoEdge(CCGFace *f, CCGEdge *e, int lvl, int eX, int eY, int levels, int dataSize)
{
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
int maxGridSize = ccg_gridsize(levels);
int spacing = ccg_spacing(levels, lvl);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
int S, x, y, cx, cy;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (S = 0; S < f->numVerts; S++)
if (FACE_getEdges(f)[S] == e)
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
break;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
eX = eX * spacing;
eY = eY * spacing;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (e->v0!=FACE_getVerts(f)[S]) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
eX = (maxGridSize * 2 - 1) - 1 - eX;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
y = maxGridSize - 1 - eX;
x = maxGridSize - 1 - eY;
if (x<0) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
S = (S + f->numVerts - 1) % f->numVerts;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
cx = y;
cy = -x;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else if (y < 0) {
S = (S + 1) % f->numVerts;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
cx = -y;
cy = x;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
cx = x;
cy = y;
}
return _face_getIFCo(f, levels, S, cx, cy, levels, dataSize);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static float *_face_getIFNoEdge(CCGFace *f, CCGEdge *e, int lvl, int eX, int eY, int levels, int dataSize, int normalDataOffset)
{
return (float *) ((byte *) _face_getIFCoEdge(f, e, lvl, eX, eY, levels, dataSize) + normalDataOffset);
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void _face_calcIFNo(CCGFace *f, int lvl, int S, int x, int y, float *no, int levels, int dataSize)
{
float *a = _face_getIFCo(f, lvl, S, x + 0, y + 0, levels, dataSize);
float *b = _face_getIFCo(f, lvl, S, x + 1, y + 0, levels, dataSize);
float *c = _face_getIFCo(f, lvl, S, x + 1, y + 1, levels, dataSize);
float *d = _face_getIFCo(f, lvl, S, x + 0, y + 1, levels, dataSize);
- bug fix, vertex normal calculation during incremental update was not correct (although fairly unnoticable). - bug fix, vertex normal calculation didn't normalize face normals before summing... silly mistake p.s. perhaps the Crystal Space bla bla naming conversation is not most appropriate for the commit list?
2005-06-23 23:44:22 +00:00
float a_cX = c[0]-a[0], a_cY = c[1]-a[1], a_cZ = c[2]-a[2];
float b_dX = d[0]-b[0], b_dY = d[1]-b[1], b_dZ = d[2]-b[2];
float length;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
no[0] = b_dY * a_cZ - b_dZ * a_cY;
no[1] = b_dZ * a_cX - b_dX * a_cZ;
no[2] = b_dX * a_cY - b_dY * a_cX;
- bug fix, vertex normal calculation during incremental update was not correct (although fairly unnoticable). - bug fix, vertex normal calculation didn't normalize face normals before summing... silly mistake p.s. perhaps the Crystal Space bla bla naming conversation is not most appropriate for the commit list?
2005-06-23 23:44:22 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
length = sqrt(no[0] * no[0] + no[1] * no[1] + no[2] * no[2]);
- bug fix, vertex normal calculation during incremental update was not correct (although fairly unnoticable). - bug fix, vertex normal calculation didn't normalize face normals before summing... silly mistake p.s. perhaps the Crystal Space bla bla naming conversation is not most appropriate for the commit list?
2005-06-23 23:44:22 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (length > EPSILON) {
- bug fix, vertex normal calculation during incremental update was not correct (although fairly unnoticable). - bug fix, vertex normal calculation didn't normalize face normals before summing... silly mistake p.s. perhaps the Crystal Space bla bla naming conversation is not most appropriate for the commit list?
2005-06-23 23:44:22 +00:00
float invLength = 1.f/length;
no[0] *= invLength;
no[1] *= invLength;
no[2] *= invLength;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- bug fix, vertex normal calculation during incremental update was not correct (although fairly unnoticable). - bug fix, vertex normal calculation didn't normalize face normals before summing... silly mistake p.s. perhaps the Crystal Space bla bla naming conversation is not most appropriate for the commit list?
2005-06-23 23:44:22 +00:00
NormZero(no);
}
}
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void _face_free(CCGFace *f, CCGSubSurf *ss)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGSUBSURF_free(ss, f);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void _face_unlinkMarkAndFree(CCGFace *f, CCGSubSurf *ss)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
int j;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (j = 0; j < f->numVerts; j++) {
resolve some compiler warnings with intel c/c++ compiler * subsurf code had a lot of unused variables, removed these where they are obviously not needed. commented if they could be useful later. * some variables declorations hide existing variables (many of these left), but fixed some that could cause confusion. * removed unused vars * obscure python memory leak with colorband. * make_sample_tables had a loop running wasnt used. * if 0'd functions in arithb.c that are not used yet. * made many functions static
2008-09-29 17:08:11 +00:00
_vert_remFace(FACE_getVerts(f)[j], f);
_edge_remFace(FACE_getEdges(f)[j], f);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
FACE_getVerts(f)[j]->flags |= Vert_eEffected;
}
_face_free(f, ss);
}
/***/
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGSubSurf *ccgSubSurf_new(CCGMeshIFC *ifc, int subdivLevels, CCGAllocatorIFC *allocatorIFC, CCGAllocatorHDL allocator)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (!allocatorIFC) {
allocatorIFC = _getStandardAllocatorIFC();
allocator = NULL;
}
if (subdivLevels<1) {
return NULL;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGSubSurf *ss = allocatorIFC->alloc(allocator, sizeof(*ss));
ss->allocatorIFC = *allocatorIFC;
ss->allocator = allocator;
ss->vMap = _ehash_new(0, &ss->allocatorIFC, ss->allocator);
ss->eMap = _ehash_new(0, &ss->allocatorIFC, ss->allocator);
ss->fMap = _ehash_new(0, &ss->allocatorIFC, ss->allocator);
ss->meshIFC = *ifc;
- shuffled editmesh derived function name/function - added ModifierTypeInfo.freeData function - added modifier_{new,free] utility function - added ccgSubSurf_getUseAgeCounts to query info - removed subsurf modifier faking (ME_SUBSURF flag is no longer valid). subsurf modifier gets converted on file load although there is obscure linked mesh situation where this can go wrong, will fix shortly. this also means that some places in the code that test/copy subsurf settings are broken for the time being. - shuffled modifier calculation to be simpler. note that all modifiers are currently disabled in editmode (including subsurf). don't worry, will return shortly. - bug fix, build modifier didn't randomize meshes with only verts - cleaned up subsurf_ccg and adapted for future editmode modifier work - added editmesh.derived{Cage,Final}, not used yet - added SubsurfModifierData.{mCache,emCache}, will be used to cache subsurf instead of caching in derivedmesh itself - removed old subsurf buttons - added do_modifiers_buttons to handle modifier events - removed count_object counting of modifier (subsurfed) objects... this would be nice to add back at some point but requires care. probably requires rewrite of counting system. New feature: Incremental Subsurf in Object Mode The previous release introduce incremental subsurf calculation during editmode but it was not turned on during object mode. In general it does not make sense to have it always enabled during object mode because it requires caching a fair amount of information about the mesh which is a waste of memory unless the mesh is often recalculated. However, for mesh's that have subsurfed armatures for example, or that have other modifiers so that the mesh is essentially changing on every frame, it makes a lot of sense to keep the subsurf'd object around and that is what the new incremental subsurf modifier toggle is for. The intent is that the user will enable this option for (a) a mesh that is currently under active editing or (b) a mesh that is heavily updated in the scene, such as a character. I will try to write more about this feature for release, because it has advantages and disadvantages that are not immediately obvious (the first user reaction will be to turn it on for ever object, which is probably not correct).
2005-07-21 20:30:33 +00:00
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
ss->subdivLevels = subdivLevels;
ss->numGrids = 0;
ss->allowEdgeCreation = 0;
- kinda crazy, but replaced old ME_SIMPLE_SUBDIV method with just using regular ccgsubsurf but with crease set to full.
2005-04-04 02:55:56 +00:00
ss->defaultCreaseValue = 0;
- made make_edge mark edges with LOOSEEDGE appropriately - added user settable defaultEdgeData (for auto edge creation in CCGSubSurf) - bug fix, possible crash on meshes with loose edges but in mface not in medge - missed file in last commit, for proper updating in image window
2005-08-20 09:16:09 +00:00
ss->defaultEdgeUserData = NULL;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
ss->useAgeCounts = 0;
ss->vertUserAgeOffset = ss->edgeUserAgeOffset = ss->faceUserAgeOffset = 0;
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
ss->calcVertNormals = 0;
ss->normalDataOffset = 0;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
ss->q = CCGSUBSURF_alloc(ss, ss->meshIFC.vertDataSize);
ss->r = CCGSUBSURF_alloc(ss, ss->meshIFC.vertDataSize);
ss->currentAge = 0;
ss->syncState = eSyncState_None;
ss->oldVMap = ss->oldEMap = ss->oldFMap = NULL;
ss->lenTempArrays = 0;
ss->tempVerts = NULL;
ss->tempEdges = NULL;
return ss;
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void ccgSubSurf_free(CCGSubSurf *ss)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGAllocatorIFC allocatorIFC = ss->allocatorIFC;
CCGAllocatorHDL allocator = ss->allocator;
if (ss->syncState) {
_ehash_free(ss->oldFMap, (EHEntryFreeFP) _face_free, ss);
_ehash_free(ss->oldEMap, (EHEntryFreeFP) _edge_free, ss);
_ehash_free(ss->oldVMap, (EHEntryFreeFP) _vert_free, ss);
Fix for a memory leak in subsurf code that is using memory arena, temporary arrays are now allocated with regular guardedalloc.
2010-02-08 15:01:11 +00:00
MEM_freeN(ss->tempVerts);
MEM_freeN(ss->tempEdges);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
CCGSUBSURF_free(ss, ss->r);
CCGSUBSURF_free(ss, ss->q);
- made make_edge mark edges with LOOSEEDGE appropriately - added user settable defaultEdgeData (for auto edge creation in CCGSubSurf) - bug fix, possible crash on meshes with loose edges but in mface not in medge - missed file in last commit, for proper updating in image window
2005-08-20 09:16:09 +00:00
if (ss->defaultEdgeUserData) CCGSUBSURF_free(ss, ss->defaultEdgeUserData);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
_ehash_free(ss->fMap, (EHEntryFreeFP) _face_free, ss);
_ehash_free(ss->eMap, (EHEntryFreeFP) _edge_free, ss);
_ehash_free(ss->vMap, (EHEntryFreeFP) _vert_free, ss);
CCGSUBSURF_free(ss, ss);
if (allocatorIFC.release) {
allocatorIFC.release(allocator);
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGError ccgSubSurf_setAllowEdgeCreation(CCGSubSurf *ss, int allowEdgeCreation, float defaultCreaseValue, void *defaultUserData)
{
- made make_edge mark edges with LOOSEEDGE appropriately - added user settable defaultEdgeData (for auto edge creation in CCGSubSurf) - bug fix, possible crash on meshes with loose edges but in mface not in medge - missed file in last commit, for proper updating in image window
2005-08-20 09:16:09 +00:00
if (ss->defaultEdgeUserData) {
CCGSUBSURF_free(ss, ss->defaultEdgeUserData);
}
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
ss->allowEdgeCreation = !!allowEdgeCreation;
- kinda crazy, but replaced old ME_SIMPLE_SUBDIV method with just using regular ccgsubsurf but with crease set to full.
2005-04-04 02:55:56 +00:00
ss->defaultCreaseValue = defaultCreaseValue;
- made make_edge mark edges with LOOSEEDGE appropriately - added user settable defaultEdgeData (for auto edge creation in CCGSubSurf) - bug fix, possible crash on meshes with loose edges but in mface not in medge - missed file in last commit, for proper updating in image window
2005-08-20 09:16:09 +00:00
ss->defaultEdgeUserData = CCGSUBSURF_alloc(ss, ss->meshIFC.edgeUserSize);
if (defaultUserData) {
memcpy(ss->defaultEdgeUserData, defaultUserData, ss->meshIFC.edgeUserSize);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- made make_edge mark edges with LOOSEEDGE appropriately - added user settable defaultEdgeData (for auto edge creation in CCGSubSurf) - bug fix, possible crash on meshes with loose edges but in mface not in medge - missed file in last commit, for proper updating in image window
2005-08-20 09:16:09 +00:00
memset(ss->defaultEdgeUserData, 0, ss->meshIFC.edgeUserSize);
}
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return eCCGError_None;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void ccgSubSurf_getAllowEdgeCreation(CCGSubSurf *ss, int *allowEdgeCreation_r, float *defaultCreaseValue_r, void *defaultUserData_r)
{
- convert all DerivedMesh map functions to use index based mapping (instead of Edit{Vert,Edge,Face} pointers) - dropped convertToDispListMeshMapped (whew, glad of it too) - added DerivedMesh drawMappedFaces function - dropped EM suffix for DerivedMesh functions, it was neither particularly correct nor descriptive - converted test_index_mface to test_index_face that also corrects MCol and TFace. Good thing we had three versions of this routine, you never know when one might burn down. - removed flipnorm_mesh, not used anymore (and was incorrect to boot) - Getting face select to work with modifiers turned out to be much more complicated than expected. Reworked mapping architecture for modifiers - basically elements in a DispListMesh are now required to be stored in an order that corresponds exactly to original ordering. MVert/MEdge/MFace all have a new flag ME_XXX_STEPINDEX that is set on each element that is set on the first derived element of each original element. I can't say the code to follow these requirements for subsurf is particularly transparent, but on the upside it is a reasonably consistent and simple system that is memory efficient and allows keeping the DispListMesh structure. - rewrote mirror modifier to be simpler/conform to new requirements for mapped DispListMesh structure. This also means that mirror interacts much better with incremental subsurf calculation (it used to recalc one entire side on any topology change, now it generally avoids that). - added EM_{init,free}_index_arrays and EM_get_{vert,edge,face}_for_index functions to handle mapping indices back into appropriate EditMesh structures. - bug fix, make edges didn't recalc object data - bug fix, initial image assignment to TFace's didn't recalc object data - new feature, added circle select support for FACESELECT - bug fix, creating new faces in editmode duplicated the TFACE active flag - but there should only be one active tface - bug fix, possible crash when deleting all faces in faceselect mode on mesh with tfaces... Still todo: TFace edge drawing is still not always correct in face mode, in particular with a mirror modifier when mesh has edges (and no preceeding subsurf). Have not yet decided how to deal with this. Best solution is probably to do switch to meshes all having MEdge's, in which case I can get rid of TFace edge flags (and need to recalc modifiers on tface selection change).
2005-08-20 03:08:23 +00:00
if (allowEdgeCreation_r) *allowEdgeCreation_r = ss->allowEdgeCreation;
- made make_edge mark edges with LOOSEEDGE appropriately - added user settable defaultEdgeData (for auto edge creation in CCGSubSurf) - bug fix, possible crash on meshes with loose edges but in mface not in medge - missed file in last commit, for proper updating in image window
2005-08-20 09:16:09 +00:00
if (ss->allowEdgeCreation) {
if (defaultCreaseValue_r) *defaultCreaseValue_r = ss->defaultCreaseValue;
if (defaultUserData_r) memcpy(defaultUserData_r, ss->defaultEdgeUserData, ss->meshIFC.edgeUserSize);
}
- convert all DerivedMesh map functions to use index based mapping (instead of Edit{Vert,Edge,Face} pointers) - dropped convertToDispListMeshMapped (whew, glad of it too) - added DerivedMesh drawMappedFaces function - dropped EM suffix for DerivedMesh functions, it was neither particularly correct nor descriptive - converted test_index_mface to test_index_face that also corrects MCol and TFace. Good thing we had three versions of this routine, you never know when one might burn down. - removed flipnorm_mesh, not used anymore (and was incorrect to boot) - Getting face select to work with modifiers turned out to be much more complicated than expected. Reworked mapping architecture for modifiers - basically elements in a DispListMesh are now required to be stored in an order that corresponds exactly to original ordering. MVert/MEdge/MFace all have a new flag ME_XXX_STEPINDEX that is set on each element that is set on the first derived element of each original element. I can't say the code to follow these requirements for subsurf is particularly transparent, but on the upside it is a reasonably consistent and simple system that is memory efficient and allows keeping the DispListMesh structure. - rewrote mirror modifier to be simpler/conform to new requirements for mapped DispListMesh structure. This also means that mirror interacts much better with incremental subsurf calculation (it used to recalc one entire side on any topology change, now it generally avoids that). - added EM_{init,free}_index_arrays and EM_get_{vert,edge,face}_for_index functions to handle mapping indices back into appropriate EditMesh structures. - bug fix, make edges didn't recalc object data - bug fix, initial image assignment to TFace's didn't recalc object data - new feature, added circle select support for FACESELECT - bug fix, creating new faces in editmode duplicated the TFACE active flag - but there should only be one active tface - bug fix, possible crash when deleting all faces in faceselect mode on mesh with tfaces... Still todo: TFace edge drawing is still not always correct in face mode, in particular with a mirror modifier when mesh has edges (and no preceeding subsurf). Have not yet decided how to deal with this. Best solution is probably to do switch to meshes all having MEdge's, in which case I can get rid of TFace edge flags (and need to recalc modifiers on tface selection change).
2005-08-20 03:08:23 +00:00
}
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGError ccgSubSurf_setSubdivisionLevels(CCGSubSurf *ss, int subdivisionLevels)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (subdivisionLevels<=0) {
return eCCGError_InvalidValue;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else if (subdivisionLevels!=ss->subdivLevels) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
ss->numGrids = 0;
ss->subdivLevels = subdivisionLevels;
_ehash_free(ss->vMap, (EHEntryFreeFP) _vert_free, ss);
_ehash_free(ss->eMap, (EHEntryFreeFP) _edge_free, ss);
_ehash_free(ss->fMap, (EHEntryFreeFP) _face_free, ss);
ss->vMap = _ehash_new(0, &ss->allocatorIFC, ss->allocator);
ss->eMap = _ehash_new(0, &ss->allocatorIFC, ss->allocator);
ss->fMap = _ehash_new(0, &ss->allocatorIFC, ss->allocator);
}
return eCCGError_None;
}
- shuffled editmesh derived function name/function - added ModifierTypeInfo.freeData function - added modifier_{new,free] utility function - added ccgSubSurf_getUseAgeCounts to query info - removed subsurf modifier faking (ME_SUBSURF flag is no longer valid). subsurf modifier gets converted on file load although there is obscure linked mesh situation where this can go wrong, will fix shortly. this also means that some places in the code that test/copy subsurf settings are broken for the time being. - shuffled modifier calculation to be simpler. note that all modifiers are currently disabled in editmode (including subsurf). don't worry, will return shortly. - bug fix, build modifier didn't randomize meshes with only verts - cleaned up subsurf_ccg and adapted for future editmode modifier work - added editmesh.derived{Cage,Final}, not used yet - added SubsurfModifierData.{mCache,emCache}, will be used to cache subsurf instead of caching in derivedmesh itself - removed old subsurf buttons - added do_modifiers_buttons to handle modifier events - removed count_object counting of modifier (subsurfed) objects... this would be nice to add back at some point but requires care. probably requires rewrite of counting system. New feature: Incremental Subsurf in Object Mode The previous release introduce incremental subsurf calculation during editmode but it was not turned on during object mode. In general it does not make sense to have it always enabled during object mode because it requires caching a fair amount of information about the mesh which is a waste of memory unless the mesh is often recalculated. However, for mesh's that have subsurfed armatures for example, or that have other modifiers so that the mesh is essentially changing on every frame, it makes a lot of sense to keep the subsurf'd object around and that is what the new incremental subsurf modifier toggle is for. The intent is that the user will enable this option for (a) a mesh that is currently under active editing or (b) a mesh that is heavily updated in the scene, such as a character. I will try to write more about this feature for release, because it has advantages and disadvantages that are not immediately obvious (the first user reaction will be to turn it on for ever object, which is probably not correct).
2005-07-21 20:30:33 +00:00
void ccgSubSurf_getUseAgeCounts(CCGSubSurf *ss, int *useAgeCounts_r, int *vertUserOffset_r, int *edgeUserOffset_r, int *faceUserOffset_r)
{
*useAgeCounts_r = ss->useAgeCounts;
if (vertUserOffset_r) *vertUserOffset_r = ss->vertUserAgeOffset;
if (edgeUserOffset_r) *edgeUserOffset_r = ss->edgeUserAgeOffset;
if (faceUserOffset_r) *faceUserOffset_r = ss->faceUserAgeOffset;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGError ccgSubSurf_setUseAgeCounts(CCGSubSurf *ss, int useAgeCounts, int vertUserOffset, int edgeUserOffset, int faceUserOffset)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (useAgeCounts) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if ((vertUserOffset + 4 > ss->meshIFC.vertUserSize) ||
(edgeUserOffset + 4 > ss->meshIFC.edgeUserSize) ||
(faceUserOffset + 4 > ss->meshIFC.faceUserSize))
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return eCCGError_InvalidValue;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
ss->useAgeCounts = 1;
ss->vertUserAgeOffset = vertUserOffset;
ss->edgeUserAgeOffset = edgeUserOffset;
ss->faceUserAgeOffset = faceUserOffset;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
ss->useAgeCounts = 0;
ss->vertUserAgeOffset = ss->edgeUserAgeOffset = ss->faceUserAgeOffset = 0;
}
return eCCGError_None;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGError ccgSubSurf_setCalcVertexNormals(CCGSubSurf *ss, int useVertNormals, int normalDataOffset)
{
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
if (useVertNormals) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (normalDataOffset<0 || normalDataOffset + 12>ss->meshIFC.vertDataSize) {
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
return eCCGError_InvalidValue;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
ss->calcVertNormals = 1;
ss->normalDataOffset = normalDataOffset;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
ss->calcVertNormals = 0;
ss->normalDataOffset = 0;
}
return eCCGError_None;
}
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
/***/
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGError ccgSubSurf_initFullSync(CCGSubSurf *ss)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (ss->syncState!=eSyncState_None) {
return eCCGError_InvalidSyncState;
}
ss->currentAge++;
ss->oldVMap = ss->vMap;
ss->oldEMap = ss->eMap;
ss->oldFMap = ss->fMap;
- added data arguments to deformer modifiers, in case someone wants to write one that is based on geometry (and not just vertex position) - added editmode versions of modifier deform/apply calls and flag to tag modifiers that support editmode - added isFinalCalc param to applyModifier, basically a switch to let subsurf know if it is calc'ng orco or not (so it can deal with cache appropriately). This is kinda hacky and perhaps I can come up with a better solution (its also a waste to do a complete subdivide just to get vertex locations). - changed ccgsubsurf to not preallocate hash's to be approximately correct size... this was probably not a big performance savings but means that the order of faces returned by the iterator can vary after the first call, this messes up orco calculation so dropped for time being. - minor bug fix, meshes with only key didn't get vertex normals correctly calc'd - updated editmesh derivedmesh to support auxiliary locations - changed mesh_calc_modifiers to alloc deformVerts on demand - added editmesh_calc_modifiers for calculating editmesh cage and final derivedmesh's - bug fix, update shadedisplist to always calc colors (even if totvert==0) - changed load_editMesh and make_edge to build me->medge even if totedge==0 (incremental subsurf checks this) todo: add drawFacesTex for ccgderivedmesh So, modifiers in editmode are back (which means auto-mirror in edit mode works now) although still not finished. Currently no cage is computed, the cage is always the base mesh (in other words, Optimal edge style editing is off), and the final mesh currently includes all modifiers that work in edit mode (including lattice and curve). At some point there will be toggles for which modifiers affect the final/cage editmode derivedmesh's. Also, very nice new feature is that incremental subsurf in object mode returns a ccgderivedmesh object instead of copying to a new displistmesh. This can make a *huge* speed difference, and is very nice for working with deformed armatures (esp. with only small per frame changes).
2005-07-22 07:37:15 +00:00
ss->vMap = _ehash_new(0, &ss->allocatorIFC, ss->allocator);
ss->eMap = _ehash_new(0, &ss->allocatorIFC, ss->allocator);
ss->fMap = _ehash_new(0, &ss->allocatorIFC, ss->allocator);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
ss->numGrids = 0;
ss->lenTempArrays = 12;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
ss->tempVerts = MEM_mallocN(sizeof(*ss->tempVerts) * ss->lenTempArrays, "CCGSubsurf tempVerts");
ss->tempEdges = MEM_mallocN(sizeof(*ss->tempEdges) * ss->lenTempArrays, "CCGSubsurf tempEdges");
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
ss->syncState = eSyncState_Vert;
return eCCGError_None;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGError ccgSubSurf_initPartialSync(CCGSubSurf *ss)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (ss->syncState!=eSyncState_None) {
return eCCGError_InvalidSyncState;
}
ss->currentAge++;
ss->syncState = eSyncState_Partial;
return eCCGError_None;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGError ccgSubSurf_syncVertDel(CCGSubSurf *ss, CCGVertHDL vHDL)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (ss->syncState!=eSyncState_Partial) {
return eCCGError_InvalidSyncState;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- more warning removal/cleanup for CCG, apparently GCC is not happy about coercing (xxx**) to (void**) (sadly enough)
2005-03-27 14:37:00 +00:00
void **prevp;
CCGVert *v = _ehash_lookupWithPrev(ss->vMap, vHDL, &prevp);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (!v || v->numFaces || v->numEdges) {
return eCCGError_InvalidValue;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
*prevp = v->next;
_vert_free(v, ss);
}
}
return eCCGError_None;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGError ccgSubSurf_syncEdgeDel(CCGSubSurf *ss, CCGEdgeHDL eHDL)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (ss->syncState!=eSyncState_Partial) {
return eCCGError_InvalidSyncState;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- more warning removal/cleanup for CCG, apparently GCC is not happy about coercing (xxx**) to (void**) (sadly enough)
2005-03-27 14:37:00 +00:00
void **prevp;
- fix warnings for gcc - some subsurf settings not correctly changed in editmode
2005-03-31 16:08:29 +00:00
CCGEdge *e = _ehash_lookupWithPrev(ss->eMap, eHDL, &prevp);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (!e || e->numFaces) {
return eCCGError_InvalidValue;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
*prevp = e->next;
_edge_unlinkMarkAndFree(e, ss);
}
}
return eCCGError_None;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGError ccgSubSurf_syncFaceDel(CCGSubSurf *ss, CCGFaceHDL fHDL)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (ss->syncState!=eSyncState_Partial) {
return eCCGError_InvalidSyncState;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- more warning removal/cleanup for CCG, apparently GCC is not happy about coercing (xxx**) to (void**) (sadly enough)
2005-03-27 14:37:00 +00:00
void **prevp;
CCGFace *f = _ehash_lookupWithPrev(ss->fMap, fHDL, &prevp);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (!f) {
return eCCGError_InvalidValue;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
*prevp = f->next;
_face_unlinkMarkAndFree(f, ss);
}
}
return eCCGError_None;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGError ccgSubSurf_syncVert(CCGSubSurf *ss, CCGVertHDL vHDL, const void *vertData, int seam, CCGVert **v_r)
{
- more warning removal/cleanup for CCG, apparently GCC is not happy about coercing (xxx**) to (void**) (sadly enough)
2005-03-27 14:37:00 +00:00
void **prevp;
- convert all DerivedMesh map functions to use index based mapping (instead of Edit{Vert,Edge,Face} pointers) - dropped convertToDispListMeshMapped (whew, glad of it too) - added DerivedMesh drawMappedFaces function - dropped EM suffix for DerivedMesh functions, it was neither particularly correct nor descriptive - converted test_index_mface to test_index_face that also corrects MCol and TFace. Good thing we had three versions of this routine, you never know when one might burn down. - removed flipnorm_mesh, not used anymore (and was incorrect to boot) - Getting face select to work with modifiers turned out to be much more complicated than expected. Reworked mapping architecture for modifiers - basically elements in a DispListMesh are now required to be stored in an order that corresponds exactly to original ordering. MVert/MEdge/MFace all have a new flag ME_XXX_STEPINDEX that is set on each element that is set on the first derived element of each original element. I can't say the code to follow these requirements for subsurf is particularly transparent, but on the upside it is a reasonably consistent and simple system that is memory efficient and allows keeping the DispListMesh structure. - rewrote mirror modifier to be simpler/conform to new requirements for mapped DispListMesh structure. This also means that mirror interacts much better with incremental subsurf calculation (it used to recalc one entire side on any topology change, now it generally avoids that). - added EM_{init,free}_index_arrays and EM_get_{vert,edge,face}_for_index functions to handle mapping indices back into appropriate EditMesh structures. - bug fix, make edges didn't recalc object data - bug fix, initial image assignment to TFace's didn't recalc object data - new feature, added circle select support for FACESELECT - bug fix, creating new faces in editmode duplicated the TFACE active flag - but there should only be one active tface - bug fix, possible crash when deleting all faces in faceselect mode on mesh with tfaces... Still todo: TFace edge drawing is still not always correct in face mode, in particular with a mirror modifier when mesh has edges (and no preceeding subsurf). Have not yet decided how to deal with this. Best solution is probably to do switch to meshes all having MEdge's, in which case I can get rid of TFace edge flags (and need to recalc modifiers on tface selection change).
2005-08-20 03:08:23 +00:00
CCGVert *v = NULL;
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
short seamflag = (seam)? Vert_eSeam: 0;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (ss->syncState == eSyncState_Partial) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
v = _ehash_lookupWithPrev(ss->vMap, vHDL, &prevp);
if (!v) {
resolve some compiler warnings with intel c/c++ compiler * subsurf code had a lot of unused variables, removed these where they are obviously not needed. commented if they could be useful later. * some variables declorations hide existing variables (many of these left), but fixed some that could cause confusion. * removed unused vars * obscure python memory leak with colorband. * make_sample_tables had a loop running wasnt used. * if 0'd functions in arithb.c that are not used yet. * made many functions static
2008-09-29 17:08:11 +00:00
v = _vert_new(vHDL, ss);
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataCopy(_vert_getCo(v,0,ss->meshIFC.vertDataSize), vertData);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
_ehash_insert(ss->vMap, (EHEntry*) v);
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
v->flags = Vert_eEffected|seamflag;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else if (!VertDataEqual(vertData, _vert_getCo(v, 0, ss->meshIFC.vertDataSize)) || ((v->flags & Vert_eSeam) != seamflag)) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
int i, j;
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataCopy(_vert_getCo(v,0,ss->meshIFC.vertDataSize), vertData);
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
v->flags = Vert_eEffected|seamflag;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < v->numEdges; i++) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGEdge *e = v->edges[i];
e->v0->flags |= Vert_eEffected;
e->v1->flags |= Vert_eEffected;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < v->numFaces; i++) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGFace *f = v->faces[i];
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (j = 0; j < f->numVerts; j++) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
FACE_getVerts(f)[j]->flags |= Vert_eEffected;
}
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (ss->syncState!=eSyncState_Vert) {
return eCCGError_InvalidSyncState;
}
v = _ehash_lookupWithPrev(ss->oldVMap, vHDL, &prevp);
if (!v) {
resolve some compiler warnings with intel c/c++ compiler * subsurf code had a lot of unused variables, removed these where they are obviously not needed. commented if they could be useful later. * some variables declorations hide existing variables (many of these left), but fixed some that could cause confusion. * removed unused vars * obscure python memory leak with colorband. * make_sample_tables had a loop running wasnt used. * if 0'd functions in arithb.c that are not used yet. * made many functions static
2008-09-29 17:08:11 +00:00
v = _vert_new(vHDL, ss);
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataCopy(_vert_getCo(v,0,ss->meshIFC.vertDataSize), vertData);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
_ehash_insert(ss->vMap, (EHEntry*) v);
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
v->flags = Vert_eEffected|seamflag;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else if (!VertDataEqual(vertData, _vert_getCo(v, 0, ss->meshIFC.vertDataSize)) || ((v->flags & Vert_eSeam) != seamflag)) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
*prevp = v->next;
_ehash_insert(ss->vMap, (EHEntry*) v);
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataCopy(_vert_getCo(v,0,ss->meshIFC.vertDataSize), vertData);
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
v->flags = Vert_eEffected|Vert_eChanged|seamflag;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
*prevp = v->next;
_ehash_insert(ss->vMap, (EHEntry*) v);
v->flags = 0;
}
}
- convert all DerivedMesh map functions to use index based mapping (instead of Edit{Vert,Edge,Face} pointers) - dropped convertToDispListMeshMapped (whew, glad of it too) - added DerivedMesh drawMappedFaces function - dropped EM suffix for DerivedMesh functions, it was neither particularly correct nor descriptive - converted test_index_mface to test_index_face that also corrects MCol and TFace. Good thing we had three versions of this routine, you never know when one might burn down. - removed flipnorm_mesh, not used anymore (and was incorrect to boot) - Getting face select to work with modifiers turned out to be much more complicated than expected. Reworked mapping architecture for modifiers - basically elements in a DispListMesh are now required to be stored in an order that corresponds exactly to original ordering. MVert/MEdge/MFace all have a new flag ME_XXX_STEPINDEX that is set on each element that is set on the first derived element of each original element. I can't say the code to follow these requirements for subsurf is particularly transparent, but on the upside it is a reasonably consistent and simple system that is memory efficient and allows keeping the DispListMesh structure. - rewrote mirror modifier to be simpler/conform to new requirements for mapped DispListMesh structure. This also means that mirror interacts much better with incremental subsurf calculation (it used to recalc one entire side on any topology change, now it generally avoids that). - added EM_{init,free}_index_arrays and EM_get_{vert,edge,face}_for_index functions to handle mapping indices back into appropriate EditMesh structures. - bug fix, make edges didn't recalc object data - bug fix, initial image assignment to TFace's didn't recalc object data - new feature, added circle select support for FACESELECT - bug fix, creating new faces in editmode duplicated the TFACE active flag - but there should only be one active tface - bug fix, possible crash when deleting all faces in faceselect mode on mesh with tfaces... Still todo: TFace edge drawing is still not always correct in face mode, in particular with a mirror modifier when mesh has edges (and no preceeding subsurf). Have not yet decided how to deal with this. Best solution is probably to do switch to meshes all having MEdge's, in which case I can get rid of TFace edge flags (and need to recalc modifiers on tface selection change).
2005-08-20 03:08:23 +00:00
if (v_r) *v_r = v;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return eCCGError_None;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGError ccgSubSurf_syncEdge(CCGSubSurf *ss, CCGEdgeHDL eHDL, CCGVertHDL e_vHDL0, CCGVertHDL e_vHDL1, float crease, CCGEdge **e_r)
{
- more warning removal/cleanup for CCG, apparently GCC is not happy about coercing (xxx**) to (void**) (sadly enough)
2005-03-27 14:37:00 +00:00
void **prevp;
- convert all DerivedMesh map functions to use index based mapping (instead of Edit{Vert,Edge,Face} pointers) - dropped convertToDispListMeshMapped (whew, glad of it too) - added DerivedMesh drawMappedFaces function - dropped EM suffix for DerivedMesh functions, it was neither particularly correct nor descriptive - converted test_index_mface to test_index_face that also corrects MCol and TFace. Good thing we had three versions of this routine, you never know when one might burn down. - removed flipnorm_mesh, not used anymore (and was incorrect to boot) - Getting face select to work with modifiers turned out to be much more complicated than expected. Reworked mapping architecture for modifiers - basically elements in a DispListMesh are now required to be stored in an order that corresponds exactly to original ordering. MVert/MEdge/MFace all have a new flag ME_XXX_STEPINDEX that is set on each element that is set on the first derived element of each original element. I can't say the code to follow these requirements for subsurf is particularly transparent, but on the upside it is a reasonably consistent and simple system that is memory efficient and allows keeping the DispListMesh structure. - rewrote mirror modifier to be simpler/conform to new requirements for mapped DispListMesh structure. This also means that mirror interacts much better with incremental subsurf calculation (it used to recalc one entire side on any topology change, now it generally avoids that). - added EM_{init,free}_index_arrays and EM_get_{vert,edge,face}_for_index functions to handle mapping indices back into appropriate EditMesh structures. - bug fix, make edges didn't recalc object data - bug fix, initial image assignment to TFace's didn't recalc object data - new feature, added circle select support for FACESELECT - bug fix, creating new faces in editmode duplicated the TFACE active flag - but there should only be one active tface - bug fix, possible crash when deleting all faces in faceselect mode on mesh with tfaces... Still todo: TFace edge drawing is still not always correct in face mode, in particular with a mirror modifier when mesh has edges (and no preceeding subsurf). Have not yet decided how to deal with this. Best solution is probably to do switch to meshes all having MEdge's, in which case I can get rid of TFace edge flags (and need to recalc modifiers on tface selection change).
2005-08-20 03:08:23 +00:00
CCGEdge *e = NULL, *eNew;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (ss->syncState == eSyncState_Partial) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
e = _ehash_lookupWithPrev(ss->eMap, eHDL, &prevp);
- take out compile time conditional behavior of creasing for ccg subsurf (always on) - bug fix, creasing wasn't evaluated properly after incremental change
2005-04-01 02:07:34 +00:00
if (!e || e->v0->vHDL!=e_vHDL0 || e->v1->vHDL!=e_vHDL1 || crease!=e->crease) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGVert *v0 = _ehash_lookup(ss->vMap, e_vHDL0);
CCGVert *v1 = _ehash_lookup(ss->vMap, e_vHDL1);
resolve some compiler warnings with intel c/c++ compiler * subsurf code had a lot of unused variables, removed these where they are obviously not needed. commented if they could be useful later. * some variables declorations hide existing variables (many of these left), but fixed some that could cause confusion. * removed unused vars * obscure python memory leak with colorband. * make_sample_tables had a loop running wasnt used. * if 0'd functions in arithb.c that are not used yet. * made many functions static
2008-09-29 17:08:11 +00:00
eNew = _edge_new(eHDL, v0, v1, crease, ss);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (e) {
*prevp = eNew;
eNew->next = e->next;
_edge_unlinkMarkAndFree(e, ss);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
_ehash_insert(ss->eMap, (EHEntry*) eNew);
}
eNew->v0->flags |= Vert_eEffected;
eNew->v1->flags |= Vert_eEffected;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
if (ss->syncState == eSyncState_Vert) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
ss->syncState = eSyncState_Edge;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else if (ss->syncState!=eSyncState_Edge) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return eCCGError_InvalidSyncState;
}
e = _ehash_lookupWithPrev(ss->oldEMap, eHDL, &prevp);
- take out compile time conditional behavior of creasing for ccg subsurf (always on) - bug fix, creasing wasn't evaluated properly after incremental change
2005-04-01 02:07:34 +00:00
if (!e || e->v0->vHDL!=e_vHDL0 || e->v1->vHDL!=e_vHDL1|| e->crease!=crease) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGVert *v0 = _ehash_lookup(ss->vMap, e_vHDL0);
CCGVert *v1 = _ehash_lookup(ss->vMap, e_vHDL1);
resolve some compiler warnings with intel c/c++ compiler * subsurf code had a lot of unused variables, removed these where they are obviously not needed. commented if they could be useful later. * some variables declorations hide existing variables (many of these left), but fixed some that could cause confusion. * removed unused vars * obscure python memory leak with colorband. * make_sample_tables had a loop running wasnt used. * if 0'd functions in arithb.c that are not used yet. * made many functions static
2008-09-29 17:08:11 +00:00
e = _edge_new(eHDL, v0, v1, crease, ss);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
_ehash_insert(ss->eMap, (EHEntry*) e);
e->v0->flags |= Vert_eEffected;
e->v1->flags |= Vert_eEffected;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
*prevp = e->next;
_ehash_insert(ss->eMap, (EHEntry*) e);
e->flags = 0;
if ((e->v0->flags|e->v1->flags)&Vert_eChanged) {
e->v0->flags |= Vert_eEffected;
e->v1->flags |= Vert_eEffected;
}
}
}
- convert all DerivedMesh map functions to use index based mapping (instead of Edit{Vert,Edge,Face} pointers) - dropped convertToDispListMeshMapped (whew, glad of it too) - added DerivedMesh drawMappedFaces function - dropped EM suffix for DerivedMesh functions, it was neither particularly correct nor descriptive - converted test_index_mface to test_index_face that also corrects MCol and TFace. Good thing we had three versions of this routine, you never know when one might burn down. - removed flipnorm_mesh, not used anymore (and was incorrect to boot) - Getting face select to work with modifiers turned out to be much more complicated than expected. Reworked mapping architecture for modifiers - basically elements in a DispListMesh are now required to be stored in an order that corresponds exactly to original ordering. MVert/MEdge/MFace all have a new flag ME_XXX_STEPINDEX that is set on each element that is set on the first derived element of each original element. I can't say the code to follow these requirements for subsurf is particularly transparent, but on the upside it is a reasonably consistent and simple system that is memory efficient and allows keeping the DispListMesh structure. - rewrote mirror modifier to be simpler/conform to new requirements for mapped DispListMesh structure. This also means that mirror interacts much better with incremental subsurf calculation (it used to recalc one entire side on any topology change, now it generally avoids that). - added EM_{init,free}_index_arrays and EM_get_{vert,edge,face}_for_index functions to handle mapping indices back into appropriate EditMesh structures. - bug fix, make edges didn't recalc object data - bug fix, initial image assignment to TFace's didn't recalc object data - new feature, added circle select support for FACESELECT - bug fix, creating new faces in editmode duplicated the TFACE active flag - but there should only be one active tface - bug fix, possible crash when deleting all faces in faceselect mode on mesh with tfaces... Still todo: TFace edge drawing is still not always correct in face mode, in particular with a mirror modifier when mesh has edges (and no preceeding subsurf). Have not yet decided how to deal with this. Best solution is probably to do switch to meshes all having MEdge's, in which case I can get rid of TFace edge flags (and need to recalc modifiers on tface selection change).
2005-08-20 03:08:23 +00:00
if (e_r) *e_r = e;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return eCCGError_None;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGError ccgSubSurf_syncFace(CCGSubSurf *ss, CCGFaceHDL fHDL, int numVerts, CCGVertHDL *vHDLs, CCGFace **f_r)
{
- more warning removal/cleanup for CCG, apparently GCC is not happy about coercing (xxx**) to (void**) (sadly enough)
2005-03-27 14:37:00 +00:00
void **prevp;
- convert all DerivedMesh map functions to use index based mapping (instead of Edit{Vert,Edge,Face} pointers) - dropped convertToDispListMeshMapped (whew, glad of it too) - added DerivedMesh drawMappedFaces function - dropped EM suffix for DerivedMesh functions, it was neither particularly correct nor descriptive - converted test_index_mface to test_index_face that also corrects MCol and TFace. Good thing we had three versions of this routine, you never know when one might burn down. - removed flipnorm_mesh, not used anymore (and was incorrect to boot) - Getting face select to work with modifiers turned out to be much more complicated than expected. Reworked mapping architecture for modifiers - basically elements in a DispListMesh are now required to be stored in an order that corresponds exactly to original ordering. MVert/MEdge/MFace all have a new flag ME_XXX_STEPINDEX that is set on each element that is set on the first derived element of each original element. I can't say the code to follow these requirements for subsurf is particularly transparent, but on the upside it is a reasonably consistent and simple system that is memory efficient and allows keeping the DispListMesh structure. - rewrote mirror modifier to be simpler/conform to new requirements for mapped DispListMesh structure. This also means that mirror interacts much better with incremental subsurf calculation (it used to recalc one entire side on any topology change, now it generally avoids that). - added EM_{init,free}_index_arrays and EM_get_{vert,edge,face}_for_index functions to handle mapping indices back into appropriate EditMesh structures. - bug fix, make edges didn't recalc object data - bug fix, initial image assignment to TFace's didn't recalc object data - new feature, added circle select support for FACESELECT - bug fix, creating new faces in editmode duplicated the TFACE active flag - but there should only be one active tface - bug fix, possible crash when deleting all faces in faceselect mode on mesh with tfaces... Still todo: TFace edge drawing is still not always correct in face mode, in particular with a mirror modifier when mesh has edges (and no preceeding subsurf). Have not yet decided how to deal with this. Best solution is probably to do switch to meshes all having MEdge's, in which case I can get rid of TFace edge flags (and need to recalc modifiers on tface selection change).
2005-08-20 03:08:23 +00:00
CCGFace *f = NULL, *fNew;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
int j, k, topologyChanged = 0;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (numVerts > ss->lenTempArrays) {
ss->lenTempArrays = (numVerts < ss->lenTempArrays * 2) ? ss->lenTempArrays * 2 : numVerts;
ss->tempVerts = MEM_reallocN(ss->tempVerts, sizeof(*ss->tempVerts) * ss->lenTempArrays);
ss->tempEdges = MEM_reallocN(ss->tempEdges, sizeof(*ss->tempEdges) * ss->lenTempArrays);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (ss->syncState == eSyncState_Partial) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
f = _ehash_lookupWithPrev(ss->fMap, fHDL, &prevp);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (k = 0; k < numVerts; k++) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
ss->tempVerts[k] = _ehash_lookup(ss->vMap, vHDLs[k]);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (k = 0; k < numVerts; k++) {
ss->tempEdges[k] = _vert_findEdgeTo(ss->tempVerts[k], ss->tempVerts[(k + 1) % numVerts]);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
if (f) {
if ( f->numVerts!=numVerts ||
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
memcmp(FACE_getVerts(f), ss->tempVerts, sizeof(*ss->tempVerts) * numVerts) ||
memcmp(FACE_getEdges(f), ss->tempEdges, sizeof(*ss->tempEdges) * numVerts))
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
topologyChanged = 1;
}
if (!f || topologyChanged) {
resolve some compiler warnings with intel c/c++ compiler * subsurf code had a lot of unused variables, removed these where they are obviously not needed. commented if they could be useful later. * some variables declorations hide existing variables (many of these left), but fixed some that could cause confusion. * removed unused vars * obscure python memory leak with colorband. * make_sample_tables had a loop running wasnt used. * if 0'd functions in arithb.c that are not used yet. * made many functions static
2008-09-29 17:08:11 +00:00
fNew = _face_new(fHDL, ss->tempVerts, ss->tempEdges, numVerts, ss);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (f) {
ss->numGrids += numVerts - f->numVerts;
*prevp = fNew;
fNew->next = f->next;
_face_unlinkMarkAndFree(f, ss);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
ss->numGrids += numVerts;
_ehash_insert(ss->fMap, (EHEntry*) fNew);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (k = 0; k < numVerts; k++)
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
FACE_getVerts(fNew)[k]->flags |= Vert_eEffected;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
if (ss->syncState == eSyncState_Vert || ss->syncState == eSyncState_Edge) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
ss->syncState = eSyncState_Face;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else if (ss->syncState!=eSyncState_Face) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return eCCGError_InvalidSyncState;
}
f = _ehash_lookupWithPrev(ss->oldFMap, fHDL, &prevp);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (k = 0; k < numVerts; k++) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
ss->tempVerts[k] = _ehash_lookup(ss->vMap, vHDLs[k]);
- modify CCG to not crash when passed invalid faces, just ignores that face... this situation should still not happen with well written modifiers but at least it won't crash now - bug fix in mirror modifier, calculation during editmode did not check to make sure built mface's had valid indices... grr the ==0 tagging system is really a pain. - convert a few uiDefBut calls to use explicit type
2005-08-03 19:27:19 +00:00
if (!ss->tempVerts[k])
return eCCGError_InvalidValue;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (k = 0; k < numVerts; k++) {
ss->tempEdges[k] = _vert_findEdgeTo(ss->tempVerts[k], ss->tempVerts[(k + 1) % numVerts]);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
- modify CCG to not crash when passed invalid faces, just ignores that face... this situation should still not happen with well written modifiers but at least it won't crash now - bug fix in mirror modifier, calculation during editmode did not check to make sure built mface's had valid indices... grr the ==0 tagging system is really a pain. - convert a few uiDefBut calls to use explicit type
2005-08-03 19:27:19 +00:00
if (!ss->tempEdges[k]) {
if (ss->allowEdgeCreation) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGEdge *e = ss->tempEdges[k] = _edge_new((CCGEdgeHDL) -1, ss->tempVerts[k], ss->tempVerts[(k + 1) % numVerts], ss->defaultCreaseValue, ss);
- modify CCG to not crash when passed invalid faces, just ignores that face... this situation should still not happen with well written modifiers but at least it won't crash now - bug fix in mirror modifier, calculation during editmode did not check to make sure built mface's had valid indices... grr the ==0 tagging system is really a pain. - convert a few uiDefBut calls to use explicit type
2005-08-03 19:27:19 +00:00
_ehash_insert(ss->eMap, (EHEntry*) e);
e->v0->flags |= Vert_eEffected;
e->v1->flags |= Vert_eEffected;
- made make_edge mark edges with LOOSEEDGE appropriately - added user settable defaultEdgeData (for auto edge creation in CCGSubSurf) - bug fix, possible crash on meshes with loose edges but in mface not in medge - missed file in last commit, for proper updating in image window
2005-08-20 09:16:09 +00:00
if (ss->meshIFC.edgeUserSize) {
memcpy(ccgSubSurf_getEdgeUserData(ss, e), ss->defaultEdgeUserData, ss->meshIFC.edgeUserSize);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- modify CCG to not crash when passed invalid faces, just ignores that face... this situation should still not happen with well written modifiers but at least it won't crash now - bug fix in mirror modifier, calculation during editmode did not check to make sure built mface's had valid indices... grr the ==0 tagging system is really a pain. - convert a few uiDefBut calls to use explicit type
2005-08-03 19:27:19 +00:00
return eCCGError_InvalidValue;
}
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
}
if (f) {
if ( f->numVerts!=numVerts ||
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
memcmp(FACE_getVerts(f), ss->tempVerts, sizeof(*ss->tempVerts) * numVerts) ||
memcmp(FACE_getEdges(f), ss->tempEdges, sizeof(*ss->tempEdges) * numVerts))
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
topologyChanged = 1;
}
if (!f || topologyChanged) {
resolve some compiler warnings with intel c/c++ compiler * subsurf code had a lot of unused variables, removed these where they are obviously not needed. commented if they could be useful later. * some variables declorations hide existing variables (many of these left), but fixed some that could cause confusion. * removed unused vars * obscure python memory leak with colorband. * make_sample_tables had a loop running wasnt used. * if 0'd functions in arithb.c that are not used yet. * made many functions static
2008-09-29 17:08:11 +00:00
f = _face_new(fHDL, ss->tempVerts, ss->tempEdges, numVerts, ss);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
_ehash_insert(ss->fMap, (EHEntry*) f);
ss->numGrids += numVerts;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (k = 0; k < numVerts; k++)
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
FACE_getVerts(f)[k]->flags |= Vert_eEffected;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
*prevp = f->next;
_ehash_insert(ss->fMap, (EHEntry*) f);
f->flags = 0;
ss->numGrids += f->numVerts;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (j = 0; j < f->numVerts; j++) {
if (FACE_getVerts(f)[j]->flags & Vert_eChanged) {
for (k = 0; k < f->numVerts; k++)
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
FACE_getVerts(f)[k]->flags |= Vert_eEffected;
break;
}
}
}
}
- convert all DerivedMesh map functions to use index based mapping (instead of Edit{Vert,Edge,Face} pointers) - dropped convertToDispListMeshMapped (whew, glad of it too) - added DerivedMesh drawMappedFaces function - dropped EM suffix for DerivedMesh functions, it was neither particularly correct nor descriptive - converted test_index_mface to test_index_face that also corrects MCol and TFace. Good thing we had three versions of this routine, you never know when one might burn down. - removed flipnorm_mesh, not used anymore (and was incorrect to boot) - Getting face select to work with modifiers turned out to be much more complicated than expected. Reworked mapping architecture for modifiers - basically elements in a DispListMesh are now required to be stored in an order that corresponds exactly to original ordering. MVert/MEdge/MFace all have a new flag ME_XXX_STEPINDEX that is set on each element that is set on the first derived element of each original element. I can't say the code to follow these requirements for subsurf is particularly transparent, but on the upside it is a reasonably consistent and simple system that is memory efficient and allows keeping the DispListMesh structure. - rewrote mirror modifier to be simpler/conform to new requirements for mapped DispListMesh structure. This also means that mirror interacts much better with incremental subsurf calculation (it used to recalc one entire side on any topology change, now it generally avoids that). - added EM_{init,free}_index_arrays and EM_get_{vert,edge,face}_for_index functions to handle mapping indices back into appropriate EditMesh structures. - bug fix, make edges didn't recalc object data - bug fix, initial image assignment to TFace's didn't recalc object data - new feature, added circle select support for FACESELECT - bug fix, creating new faces in editmode duplicated the TFACE active flag - but there should only be one active tface - bug fix, possible crash when deleting all faces in faceselect mode on mesh with tfaces... Still todo: TFace edge drawing is still not always correct in face mode, in particular with a mirror modifier when mesh has edges (and no preceeding subsurf). Have not yet decided how to deal with this. Best solution is probably to do switch to meshes all having MEdge's, in which case I can get rid of TFace edge flags (and need to recalc modifiers on tface selection change).
2005-08-20 03:08:23 +00:00
if (f_r) *f_r = f;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return eCCGError_None;
}
static void ccgSubSurf__sync(CCGSubSurf *ss);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGError ccgSubSurf_processSync(CCGSubSurf *ss)
{
if (ss->syncState == eSyncState_Partial) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
ss->syncState = eSyncState_None;
ccgSubSurf__sync(ss);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else if (ss->syncState) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
_ehash_free(ss->oldFMap, (EHEntryFreeFP) _face_unlinkMarkAndFree, ss);
_ehash_free(ss->oldEMap, (EHEntryFreeFP) _edge_unlinkMarkAndFree, ss);
_ehash_free(ss->oldVMap, (EHEntryFreeFP) _vert_free, ss);
Fix for a memory leak in subsurf code that is using memory arena, temporary arrays are now allocated with regular guardedalloc.
2010-02-08 15:01:11 +00:00
MEM_freeN(ss->tempEdges);
MEM_freeN(ss->tempVerts);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
ss->lenTempArrays = 0;
ss->oldFMap = ss->oldEMap = ss->oldVMap = NULL;
ss->tempVerts = NULL;
ss->tempEdges = NULL;
ss->syncState = eSyncState_None;
ccgSubSurf__sync(ss);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return eCCGError_InvalidSyncState;
}
return eCCGError_None;
}
Fix #20505: subsurf normals where not being set correct on correct from subsurf derivedmesh to regular (derived)mesh, causing drawing errors on apply and following modifiers to work incorrect.
2010-01-30 09:32:05 +00:00
#define VERT_getNo(e, lvl) _vert_getNo(e, lvl, vertDataSize, normalDataOffset)
#define EDGE_getNo(e, lvl, x) _edge_getNo(e, lvl, x, vertDataSize, normalDataOffset)
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
#define FACE_getIFNo(f, lvl, S, x, y) _face_getIFNo(f, lvl, S, x, y, subdivLevels, vertDataSize, normalDataOffset)
#define FACE_calcIFNo(f, lvl, S, x, y, no) _face_calcIFNo(f, lvl, S, x, y, no, subdivLevels, vertDataSize)
Fix #20505: subsurf normals where not being set correct on correct from subsurf derivedmesh to regular (derived)mesh, causing drawing errors on apply and following modifiers to work incorrect.
2010-01-30 09:32:05 +00:00
#define FACE_getIENo(f, lvl, S, x) _face_getIENo(f, lvl, S, x, subdivLevels, vertDataSize, normalDataOffset)
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
static void ccgSubSurf__calcVertNormals(CCGSubSurf *ss,
CCGVert **effectedV, CCGEdge **effectedE, CCGFace **effectedF,
int numEffectedV, int numEffectedE, int numEffectedF) {
int i,ptrIdx;
int subdivLevels = ss->subdivLevels;
int lvl = ss->subdivLevels;
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
int edgeSize = ccg_edgesize(lvl);
int gridSize = ccg_gridsize(lvl);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
int normalDataOffset = ss->normalDataOffset;
int vertDataSize = ss->meshIFC.vertDataSize;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
#pragma omp parallel for private(ptrIdx) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT)
for (ptrIdx = 0; ptrIdx < numEffectedF; ptrIdx++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGFace *f = (CCGFace*) effectedF[ptrIdx];
int S, x, y;
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
float no[3];
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (S = 0; S < f->numVerts; S++) {
for (y = 0; y < gridSize - 1; y++)
for (x = 0; x < gridSize - 1; x++)
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
NormZero(FACE_getIFNo(f, lvl, S, x, y));
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (FACE_getEdges(f)[(S - 1+f->numVerts)%f->numVerts]->flags&Edge_eEffected)
for (x = 0; x < gridSize - 1; x++)
NormZero(FACE_getIFNo(f, lvl, S, x, gridSize - 1));
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
if (FACE_getEdges(f)[S]->flags&Edge_eEffected)
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (y = 0; y < gridSize - 1; y++)
NormZero(FACE_getIFNo(f, lvl, S, gridSize - 1, y));
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
if (FACE_getVerts(f)[S]->flags&Vert_eEffected)
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
NormZero(FACE_getIFNo(f, lvl, S, gridSize - 1, gridSize - 1));
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (S = 0; S < f->numVerts; S++) {
int yLimit = !(FACE_getEdges(f)[(S - 1 + f->numVerts) % f->numVerts]->flags & Edge_eEffected);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
int xLimit = !(FACE_getEdges(f)[S]->flags&Edge_eEffected);
int yLimitNext = xLimit;
int xLimitPrev = yLimit;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (y = 0; y < gridSize - 1; y++) {
for (x = 0; x < gridSize - 1; x++) {
int xPlusOk = (!xLimit || x < gridSize - 2);
int yPlusOk = (!yLimit || y < gridSize - 2);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
FACE_calcIFNo(f, lvl, S, x, y, no);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
NormAdd(FACE_getIFNo(f, lvl, S, x + 0, y + 0), no);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
if (xPlusOk)
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
NormAdd(FACE_getIFNo(f, lvl, S, x + 1, y + 0), no);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
if (yPlusOk)
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
NormAdd(FACE_getIFNo(f, lvl, S, x + 0, y + 1), no);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
if (xPlusOk && yPlusOk) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (x < gridSize - 2 || y < gridSize - 2 || FACE_getVerts(f)[S]->flags & Vert_eEffected) {
NormAdd(FACE_getIFNo(f, lvl, S, x + 1, y + 1), no);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (x == 0 && y == 0) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
int K;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (!yLimitNext || 1<gridSize - 1)
NormAdd(FACE_getIFNo(f, lvl, (S + 1) % f->numVerts, 0, 1), no);
if (!xLimitPrev || 1<gridSize - 1)
NormAdd(FACE_getIFNo(f, lvl, (S - 1 + f->numVerts) % f->numVerts, 1, 0), no);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (K = 0; K < f->numVerts; K++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
if (K!=S) {
NormAdd(FACE_getIFNo(f, lvl, K, 0, 0), no);
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else if (y == 0) {
NormAdd(FACE_getIFNo(f, lvl, (S + 1) % f->numVerts, 0, x), no);
if (!yLimitNext || x < gridSize - 2)
NormAdd(FACE_getIFNo(f, lvl, (S + 1) % f->numVerts, 0, x + 1), no);
}
else if (x == 0) {
NormAdd(FACE_getIFNo(f, lvl, (S - 1 + f->numVerts) % f->numVerts, y, 0), no);
if (!xLimitPrev || y < gridSize - 2)
NormAdd(FACE_getIFNo(f, lvl, (S - 1 + f->numVerts) % f->numVerts, y + 1, 0), no);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
}
}
}
}
// XXX can I reduce the number of normalisations here?
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (ptrIdx = 0; ptrIdx < numEffectedV; ptrIdx++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGVert *v = (CCGVert*) effectedV[ptrIdx];
float length, *no = _vert_getNo(v, lvl, vertDataSize, normalDataOffset);
NormZero(no);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < v->numFaces; i++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGFace *f = v->faces[i];
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
NormAdd(no, FACE_getIFNo(f, lvl, _face_getVertIndex(f,v), gridSize - 1, gridSize - 1));
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
length = sqrt(no[0] * no[0] + no[1] * no[1] + no[2] * no[2]);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (length > EPSILON) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
float invLength = 1.0f/length;
no[0] *= invLength;
no[1] *= invLength;
no[2] *= invLength;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
NormZero(no);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < v->numFaces; i++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGFace *f = v->faces[i];
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
NormCopy(FACE_getIFNo(f, lvl, _face_getVertIndex(f,v), gridSize - 1, gridSize - 1), no);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (ptrIdx = 0; ptrIdx < numEffectedE; ptrIdx++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGEdge *e = (CCGEdge*) effectedE[ptrIdx];
if (e->numFaces) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGFace *fLast = e->faces[e->numFaces - 1];
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
int x;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < e->numFaces - 1; i++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGFace *f = e->faces[i];
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 1; x < edgeSize - 1; x++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
NormAdd(_face_getIFNoEdge(fLast, e, lvl, x, 0, subdivLevels, vertDataSize, normalDataOffset),
_face_getIFNoEdge(f, e, lvl, x, 0, subdivLevels, vertDataSize, normalDataOffset));
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < e->numFaces - 1; i++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGFace *f = e->faces[i];
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 1; x < edgeSize - 1; x++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
NormCopy(_face_getIFNoEdge(f, e, lvl, x, 0, subdivLevels, vertDataSize, normalDataOffset),
_face_getIFNoEdge(fLast, e, lvl, x, 0, subdivLevels, vertDataSize, normalDataOffset));
}
}
}
}
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
#pragma omp parallel for private(ptrIdx) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT)
for (ptrIdx = 0; ptrIdx < numEffectedF; ptrIdx++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGFace *f = (CCGFace*) effectedF[ptrIdx];
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
int S, x, y;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (S = 0; S < f->numVerts; S++) {
NormCopy(FACE_getIFNo(f, lvl, (S + 1) % f->numVerts, 0, gridSize - 1),
FACE_getIFNo(f, lvl, S, gridSize - 1, 0));
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (S = 0; S < f->numVerts; S++) {
for (y = 0; y < gridSize; y++) {
for (x = 0; x < gridSize; x++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
float *no = FACE_getIFNo(f, lvl, S, x, y);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
float length = sqrt(no[0] * no[0] + no[1] * no[1] + no[2] * no[2]);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (length > EPSILON) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
float invLength = 1.0f/length;
no[0] *= invLength;
no[1] *= invLength;
no[2] *= invLength;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
NormZero(no);
}
}
}
Fix #20505: subsurf normals where not being set correct on correct from subsurf derivedmesh to regular (derived)mesh, causing drawing errors on apply and following modifiers to work incorrect.
2010-01-30 09:32:05 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
VertDataCopy((float *)((byte *)FACE_getCenterData(f) + normalDataOffset),
Fix #20505: subsurf normals where not being set correct on correct from subsurf derivedmesh to regular (derived)mesh, causing drawing errors on apply and following modifiers to work incorrect.
2010-01-30 09:32:05 +00:00
FACE_getIFNo(f, lvl, S, 0, 0));
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 1; x < gridSize - 1; x++)
Fix #20505: subsurf normals where not being set correct on correct from subsurf derivedmesh to regular (derived)mesh, causing drawing errors on apply and following modifiers to work incorrect.
2010-01-30 09:32:05 +00:00
NormCopy(FACE_getIENo(f, lvl, S, x),
FACE_getIFNo(f, lvl, S, x, 0));
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (ptrIdx = 0; ptrIdx < numEffectedE; ptrIdx++) {
Fix #20505: subsurf normals where not being set correct on correct from subsurf derivedmesh to regular (derived)mesh, causing drawing errors on apply and following modifiers to work incorrect.
2010-01-30 09:32:05 +00:00
CCGEdge *e = (CCGEdge*) effectedE[ptrIdx];
if (e->numFaces) {
CCGFace *f = e->faces[0];
int x;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 0; x < edgeSize; x++)
Fix #20505: subsurf normals where not being set correct on correct from subsurf derivedmesh to regular (derived)mesh, causing drawing errors on apply and following modifiers to work incorrect.
2010-01-30 09:32:05 +00:00
NormCopy(EDGE_getNo(e, lvl, x),
_face_getIFNoEdge(f, e, lvl, x, 0, subdivLevels, vertDataSize, normalDataOffset));
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
Fix for old bug with subsurf not initializing normals for edges that had no faces, Noted that a floating point exception caused by this r28953. With the render engine using DerivedMesh normals this came up as a memory error when rendering some files. for now zero the normals, could interpolate between vertex normals if needed.
2011-03-30 02:05:10 +00:00
else {
/* set to zero here otherwise the normals are uninitialized memory
* render: tests/animation/knight.blend with valgrind.
* we could be more clever and interpolate vertex normals but these are
* most likely not used so just zero out. */
int x;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 0; x < edgeSize; x++) {
Fix for old bug with subsurf not initializing normals for edges that had no faces, Noted that a floating point exception caused by this r28953. With the render engine using DerivedMesh normals this came up as a memory error when rendering some files. for now zero the normals, could interpolate between vertex normals if needed.
2011-03-30 02:05:10 +00:00
NormZero(EDGE_getNo(e, lvl, x));
}
}
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
}
#undef FACE_getIFNo
#define VERT_getCo(v, lvl) _vert_getCo(v, lvl, vertDataSize)
#define EDGE_getCo(e, lvl, x) _edge_getCo(e, lvl, x, vertDataSize)
#define FACE_getIECo(f, lvl, S, x) _face_getIECo(f, lvl, S, x, subdivLevels, vertDataSize)
#define FACE_getIFCo(f, lvl, S, x, y) _face_getIFCo(f, lvl, S, x, y, subdivLevels, vertDataSize)
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
static void ccgSubSurf__calcSubdivLevel(CCGSubSurf *ss,
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGVert **effectedV, CCGEdge **effectedE, CCGFace **effectedF,
int numEffectedV, int numEffectedE, int numEffectedF, int curLvl)
{
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
int subdivLevels = ss->subdivLevels;
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
int edgeSize = ccg_edgesize(curLvl);
int gridSize = ccg_gridsize(curLvl);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int nextLvl = curLvl + 1;
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
int ptrIdx, cornerIdx, i;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
int vertDataSize = ss->meshIFC.vertDataSize;
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
void *q = ss->q, *r = ss->r;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
#pragma omp parallel for private(ptrIdx) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT)
for (ptrIdx = 0; ptrIdx < numEffectedF; ptrIdx++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGFace *f = (CCGFace*) effectedF[ptrIdx];
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
int S, x, y;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
/* interior face midpoints
* o old interior face points
*/
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (S = 0; S < f->numVerts; S++) {
for (y = 0; y < gridSize - 1; y++) {
for (x = 0; x < gridSize - 1; x++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
int fx = 1 + 2*x;
int fy = 1 + 2*y;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void *co0 = FACE_getIFCo(f, curLvl, S, x + 0, y + 0);
void *co1 = FACE_getIFCo(f, curLvl, S, x + 1, y + 0);
void *co2 = FACE_getIFCo(f, curLvl, S, x + 1, y + 1);
void *co3 = FACE_getIFCo(f, curLvl, S, x + 0, y + 1);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
void *co = FACE_getIFCo(f, nextLvl, S, fx, fy);
VertDataAvg4(co, co0, co1, co2, co3);
}
}
}
/* interior edge midpoints
* o old interior edge points
* o new interior face midpoints
*/
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (S = 0; S < f->numVerts; S++) {
for (x = 0; x < gridSize - 1; x++) {
int fx = x * 2 + 1;
void *co0 = FACE_getIECo(f, curLvl, S, x + 0);
void *co1 = FACE_getIECo(f, curLvl, S, x + 1);
void *co2 = FACE_getIFCo(f, nextLvl, (S + 1) % f->numVerts, 1, fx);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
void *co3 = FACE_getIFCo(f, nextLvl, S, fx, 1);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void *co = FACE_getIECo(f, nextLvl, S, fx);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataAvg4(co, co0, co1, co2, co3);
}
/* interior face interior edge midpoints
* o old interior face points
* o new interior face midpoints
*/
/* vertical */
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 1; x < gridSize - 1; x++) {
for (y = 0; y < gridSize - 1; y++) {
int fx = x * 2;
int fy = y * 2 + 1;
void *co0 = FACE_getIFCo(f, curLvl, S, x, y + 0);
void *co1 = FACE_getIFCo(f, curLvl, S, x, y + 1);
void *co2 = FACE_getIFCo(f, nextLvl, S, fx - 1, fy);
void *co3 = FACE_getIFCo(f, nextLvl, S, fx + 1, fy);
void *co = FACE_getIFCo(f, nextLvl, S, fx, fy);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataAvg4(co, co0, co1, co2, co3);
}
}
/* horizontal */
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (y = 1; y < gridSize - 1; y++) {
for (x = 0; x < gridSize - 1; x++) {
int fx = x * 2 + 1;
int fy = y * 2;
void *co0 = FACE_getIFCo(f, curLvl, S, x + 0, y);
void *co1 = FACE_getIFCo(f, curLvl, S, x + 1, y);
void *co2 = FACE_getIFCo(f, nextLvl, S, fx, fy - 1);
void *co3 = FACE_getIFCo(f, nextLvl, S, fx, fy + 1);
void *co = FACE_getIFCo(f, nextLvl, S, fx, fy);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataAvg4(co, co0, co1, co2, co3);
}
}
}
}
/* exterior edge midpoints
* o old exterior edge points
* o new interior face midpoints
*/
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (ptrIdx = 0; ptrIdx < numEffectedE; ptrIdx++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGEdge *e = (CCGEdge*) effectedE[ptrIdx];
float sharpness = EDGE_getSharpness(e, curLvl);
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
int x, j;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
2011-03-27 17:22:04 +00:00
if (_edge_isBoundary(e) || sharpness > 1.0f) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 0; x < edgeSize - 1; x++) {
int fx = x * 2 + 1;
void *co0 = EDGE_getCo(e, curLvl, x + 0);
void *co1 = EDGE_getCo(e, curLvl, x + 1);
void *co = EDGE_getCo(e, nextLvl, fx);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataCopy(co, co0);
VertDataAdd(co, co1);
subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
2011-03-27 17:22:04 +00:00
VertDataMulN(co, 0.5f);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
for (x = 0; x < edgeSize - 1; x++) {
int fx = x * 2 + 1;
void *co0 = EDGE_getCo(e, curLvl, x + 0);
void *co1 = EDGE_getCo(e, curLvl, x + 1);
void *co = EDGE_getCo(e, nextLvl, fx);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
int numFaces = 0;
VertDataCopy(q, co0);
VertDataAdd(q, co1);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (j = 0; j < e->numFaces; j++) {
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
CCGFace *f = e->faces[j];
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataAdd(q, _face_getIFCoEdge(f, e, nextLvl, fx, 1, subdivLevels, vertDataSize));
numFaces++;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
VertDataMulN(q, 1.0f / (2.0f + numFaces));
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataCopy(r, co0);
VertDataAdd(r, co1);
subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
2011-03-27 17:22:04 +00:00
VertDataMulN(r, 0.5f);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataCopy(co, q);
VertDataSub(r, q);
VertDataMulN(r, sharpness);
VertDataAdd(co, r);
}
}
}
/* exterior vertex shift
* o old vertex points (shifting)
* o old exterior edge points
* o new interior face midpoints
*/
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (ptrIdx = 0; ptrIdx < numEffectedV; ptrIdx++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGVert *v = (CCGVert*) effectedV[ptrIdx];
void *co = VERT_getCo(v, curLvl);
void *nCo = VERT_getCo(v, nextLvl);
int sharpCount = 0, allSharp = 1;
float avgSharpness = 0.0;
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
int j, seam = VERT_seam(v), seamEdges = 0;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (j = 0; j < v->numEdges; j++) {
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
CCGEdge *e = v->edges[j];
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
float sharpness = EDGE_getSharpness(e, curLvl);
if (seam && _edge_isBoundary(e))
seamEdges++;
if (sharpness!=0.0f) {
sharpCount++;
avgSharpness += sharpness;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
allSharp = 0;
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (sharpCount) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
avgSharpness /= sharpCount;
subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
2011-03-27 17:22:04 +00:00
if (avgSharpness > 1.0f) {
avgSharpness = 1.0f;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
}
Fix #25316: distorted subsurf UV in some cases. To counter distortion at seams, we add extra creasing in the UV mesh, to keep it from shrinking, leading to distorted UVs, but this wasn't always working right, so tweaked the conditions.
2011-01-05 12:04:06 +00:00
if (seamEdges < 2 || seamEdges != v->numEdges)
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
seam = 0;
if (!v->numEdges) {
VertDataCopy(nCo, co);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else if (_vert_isBoundary(v)) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
int numBoundary = 0;
VertDataZero(r);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (j = 0; j < v->numEdges; j++) {
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
CCGEdge *e = v->edges[j];
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
if (_edge_isBoundary(e)) {
VertDataAdd(r, _edge_getCoVert(e, v, curLvl, 1, vertDataSize));
numBoundary++;
}
}
VertDataCopy(nCo, co);
subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
2011-03-27 17:22:04 +00:00
VertDataMulN(nCo, 0.75f);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataMulN(r, 0.25f/numBoundary);
VertDataAdd(nCo, r);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
int cornerIdx = (1 + (1 << (curLvl))) - 2;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
int numEdges = 0, numFaces = 0;
VertDataZero(q);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (j = 0; j < v->numFaces; j++) {
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
CCGFace *f = v->faces[j];
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataAdd(q, FACE_getIFCo(f, nextLvl, _face_getVertIndex(f,v), cornerIdx, cornerIdx));
numFaces++;
}
VertDataMulN(q, 1.0f/numFaces);
VertDataZero(r);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (j = 0; j < v->numEdges; j++) {
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
CCGEdge *e = v->edges[j];
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataAdd(r, _edge_getCoVert(e, v, curLvl, 1,vertDataSize));
numEdges++;
}
VertDataMulN(r, 1.0f/numEdges);
VertDataCopy(nCo, co);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
VertDataMulN(nCo, numEdges - 2.0f);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataAdd(nCo, q);
VertDataAdd(nCo, r);
VertDataMulN(nCo, 1.0f/numEdges);
}
if ((sharpCount>1 && v->numFaces) || seam) {
VertDataZero(q);
if (seam) {
avgSharpness = 1.0f;
sharpCount = seamEdges;
allSharp = 1;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (j = 0; j < v->numEdges; j++) {
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
CCGEdge *e = v->edges[j];
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
float sharpness = EDGE_getSharpness(e, curLvl);
if (seam) {
if (_edge_isBoundary(e))
VertDataAdd(q, _edge_getCoVert(e, v, curLvl, 1, vertDataSize));
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else if (sharpness != 0.0f) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataAdd(q, _edge_getCoVert(e, v, curLvl, 1, vertDataSize));
}
}
VertDataMulN(q, (float) 1/sharpCount);
if (sharpCount!=2 || allSharp) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
// q = q + (co-q) * avgSharpness
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataCopy(r, co);
VertDataSub(r, q);
VertDataMulN(r, avgSharpness);
VertDataAdd(q, r);
}
// r = co*.75 + q*.25
VertDataCopy(r, co);
subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
2011-03-27 17:22:04 +00:00
VertDataMulN(r, .75f);
VertDataMulN(q, .25f);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataAdd(r, q);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
// nCo = nCo + (r-nCo) * avgSharpness
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataSub(r, nCo);
VertDataMulN(r, avgSharpness);
VertDataAdd(nCo, r);
}
}
/* exterior edge interior shift
* o old exterior edge midpoints (shifting)
* o old exterior edge midpoints
* o new interior face midpoints
*/
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (ptrIdx = 0; ptrIdx < numEffectedE; ptrIdx++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGEdge *e = (CCGEdge*) effectedE[ptrIdx];
float sharpness = EDGE_getSharpness(e, curLvl);
int sharpCount = 0;
float avgSharpness = 0.0;
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
int x, j;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
if (sharpness!=0.0f) {
sharpCount = 2;
avgSharpness += sharpness;
subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
2011-03-27 17:22:04 +00:00
if (avgSharpness > 1.0f) {
avgSharpness = 1.0f;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
sharpCount = 0;
avgSharpness = 0;
}
if (_edge_isBoundary(e) && (!e->numFaces || sharpCount<2)) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 1; x < edgeSize - 1; x++) {
int fx = x * 2;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
void *co = EDGE_getCo(e, curLvl, x);
void *nCo = EDGE_getCo(e, nextLvl, fx);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
VertDataCopy(r, EDGE_getCo(e, curLvl, x - 1));
VertDataAdd(r, EDGE_getCo(e, curLvl, x + 1));
subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
2011-03-27 17:22:04 +00:00
VertDataMulN(r, 0.5f);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataCopy(nCo, co);
subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
2011-03-27 17:22:04 +00:00
VertDataMulN(nCo, 0.75f);
VertDataMulN(r, 0.25f);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataAdd(nCo, r);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
for (x = 1; x < edgeSize - 1; x++) {
int fx = x * 2;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
void *co = EDGE_getCo(e, curLvl, x);
void *nCo = EDGE_getCo(e, nextLvl, fx);
int numFaces = 0;
VertDataZero(q);
VertDataZero(r);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
VertDataAdd(r, EDGE_getCo(e, curLvl, x - 1));
VertDataAdd(r, EDGE_getCo(e, curLvl, x + 1));
for (j = 0; j < e->numFaces; j++) {
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
CCGFace *f = e->faces[j];
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
VertDataAdd(q, _face_getIFCoEdge(f, e, nextLvl, fx - 1, 1, subdivLevels, vertDataSize));
VertDataAdd(q, _face_getIFCoEdge(f, e, nextLvl, fx + 1, 1, subdivLevels, vertDataSize));
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataAdd(r, _face_getIFCoEdge(f, e, curLvl, x, 1, subdivLevels, vertDataSize));
numFaces++;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
VertDataMulN(q, 1.0f / (numFaces * 2.0f));
VertDataMulN(r, 1.0f / (2.0f + numFaces));
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataCopy(nCo, co);
VertDataMulN(nCo, (float) numFaces);
VertDataAdd(nCo, q);
VertDataAdd(nCo, r);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
VertDataMulN(nCo, 1.0f / (2 + numFaces));
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (sharpCount == 2) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataCopy(q, co);
VertDataMulN(q, 6.0f);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
VertDataAdd(q, EDGE_getCo(e, curLvl, x - 1));
VertDataAdd(q, EDGE_getCo(e, curLvl, x + 1));
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataMulN(q, 1/8.0f);
VertDataSub(q, nCo);
VertDataMulN(q, avgSharpness);
VertDataAdd(nCo, q);
}
}
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
#pragma omp parallel private(ptrIdx) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT)
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
{
void *q, *r;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
Enabled openmp multithreading for multires/subsurf again, but only if there are >= 1 million faces estimated in the resulting mesh. (merge from render25 branch)
2010-06-22 15:09:41 +00:00
#pragma omp critical
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
{
Fix for a memory leak in subsurf code that is using memory arena, temporary arrays are now allocated with regular guardedalloc.
2010-02-08 15:01:11 +00:00
q = MEM_mallocN(ss->meshIFC.vertDataSize, "CCGSubsurf q");
r = MEM_mallocN(ss->meshIFC.vertDataSize, "CCGSubsurf r");
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
Enabled openmp multithreading for multires/subsurf again, but only if there are >= 1 million faces estimated in the resulting mesh. (merge from render25 branch)
2010-06-22 15:09:41 +00:00
#pragma omp for schedule(static)
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (ptrIdx = 0; ptrIdx < numEffectedF; ptrIdx++) {
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
CCGFace *f = (CCGFace*) effectedF[ptrIdx];
int S, x, y;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
/* interior center point shift
* o old face center point (shifting)
* o old interior edge points
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
* o new interior face midpoints
*/
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
VertDataZero(q);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (S = 0; S < f->numVerts; S++) {
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
VertDataAdd(q, FACE_getIFCo(f, nextLvl, S, 1, 1));
}
VertDataMulN(q, 1.0f/f->numVerts);
VertDataZero(r);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (S = 0; S < f->numVerts; S++) {
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
VertDataAdd(r, FACE_getIECo(f, curLvl, S, 1));
}
VertDataMulN(r, 1.0f/f->numVerts);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
VertDataMulN(FACE_getCenterData(f), f->numVerts - 2.0f);
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
VertDataAdd(FACE_getCenterData(f), q);
VertDataAdd(FACE_getCenterData(f), r);
VertDataMulN(FACE_getCenterData(f), 1.0f/f->numVerts);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (S = 0; S < f->numVerts; S++) {
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
/* interior face shift
* o old interior face point (shifting)
* o new interior edge midpoints
* o new interior face midpoints
*/
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 1; x < gridSize - 1; x++) {
for (y = 1; y < gridSize - 1; y++) {
int fx = x * 2;
int fy = y * 2;
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
void *co = FACE_getIFCo(f, curLvl, S, x, y);
void *nCo = FACE_getIFCo(f, nextLvl, S, fx, fy);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
VertDataAvg4(q,
FACE_getIFCo(f, nextLvl, S, fx - 1, fy - 1),
FACE_getIFCo(f, nextLvl, S, fx + 1, fy - 1),
FACE_getIFCo(f, nextLvl, S, fx + 1, fy + 1),
FACE_getIFCo(f, nextLvl, S, fx - 1, fy + 1));
VertDataAvg4(r,
FACE_getIFCo(f, nextLvl, S, fx - 1, fy + 0),
FACE_getIFCo(f, nextLvl, S, fx + 1, fy + 0),
FACE_getIFCo(f, nextLvl, S, fx + 0, fy - 1),
FACE_getIFCo(f, nextLvl, S, fx + 0, fy + 1));
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
VertDataCopy(nCo, co);
VertDataSub(nCo, q);
VertDataMulN(nCo, 0.25f);
VertDataAdd(nCo, r);
}
}
/* interior edge interior shift
* o old interior edge point (shifting)
* o new interior edge midpoints
* o new interior face midpoints
*/
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 1; x < gridSize - 1; x++) {
int fx = x * 2;
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
void *co = FACE_getIECo(f, curLvl, S, x);
void *nCo = FACE_getIECo(f, nextLvl, S, fx);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
VertDataAvg4(q,
FACE_getIFCo(f, nextLvl, (S + 1) % f->numVerts, 1, fx - 1),
FACE_getIFCo(f, nextLvl, (S + 1) % f->numVerts, 1, fx + 1),
FACE_getIFCo(f, nextLvl, S, fx + 1, + 1),
FACE_getIFCo(f, nextLvl, S, fx - 1, + 1));
VertDataAvg4(r,
FACE_getIECo(f, nextLvl, S, fx - 1),
FACE_getIECo(f, nextLvl, S, fx + 1),
FACE_getIFCo(f, nextLvl, (S + 1) % f->numVerts, 1, fx),
FACE_getIFCo(f, nextLvl, S, fx, 1));
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataCopy(nCo, co);
VertDataSub(nCo, q);
VertDataMulN(nCo, 0.25f);
VertDataAdd(nCo, r);
}
}
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
}
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
Enabled openmp multithreading for multires/subsurf again, but only if there are >= 1 million faces estimated in the resulting mesh. (merge from render25 branch)
2010-06-22 15:09:41 +00:00
#pragma omp critical
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
{
Fix for a memory leak in subsurf code that is using memory arena, temporary arrays are now allocated with regular guardedalloc.
2010-02-08 15:01:11 +00:00
MEM_freeN(q);
MEM_freeN(r);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
}
/* copy down */
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
edgeSize = ccg_edgesize(nextLvl);
gridSize = ccg_gridsize(nextLvl);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
cornerIdx = gridSize - 1;
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
#pragma omp parallel for private(i) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT)
for (i = 0; i < numEffectedE; i++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGEdge *e = effectedE[i];
VertDataCopy(EDGE_getCo(e, nextLvl, 0), VERT_getCo(e->v0, nextLvl));
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
VertDataCopy(EDGE_getCo(e, nextLvl, edgeSize - 1), VERT_getCo(e->v1, nextLvl));
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
#pragma omp parallel for private(i) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT)
for (i = 0; i < numEffectedF; i++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGFace *f = effectedF[i];
Sculpt Branch: * Multithread parts of multires and subsurf. Only loops working on face grid data and do no memory allocation have been multithreaded, others would be more complicated. * Force some CCGSubsurf functions to be inlined, gives a small overall speedup in subsurf code. * Fix sculpting not working correct with transformed objects. * Fix a few cases of "spikes" on lower level multires levels. There's still cases where it happens, usually on boundary cornders. The problem is that in such cases the limit surfaces can be very different from the low res surface, so the tangent space is very different too.. * Fix crash deleting multires higher levels with level set to 0. * Fix crashes that happened sometimes when adding faces in editmode.
2009-12-03 18:35:37 +00:00
int S, x;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (S = 0; S < f->numVerts; S++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGEdge *e = FACE_getEdges(f)[S];
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGEdge *prevE = FACE_getEdges(f)[(S + f->numVerts - 1) % f->numVerts];
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataCopy(FACE_getIFCo(f, nextLvl, S, 0, 0), FACE_getCenterData(f));
VertDataCopy(FACE_getIECo(f, nextLvl, S, 0), FACE_getCenterData(f));
VertDataCopy(FACE_getIFCo(f, nextLvl, S, cornerIdx, cornerIdx), VERT_getCo(FACE_getVerts(f)[S], nextLvl));
VertDataCopy(FACE_getIECo(f, nextLvl, S, cornerIdx), EDGE_getCo(FACE_getEdges(f)[S], nextLvl, cornerIdx));
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 1; x < gridSize - 1; x++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
void *co = FACE_getIECo(f, nextLvl, S, x);
VertDataCopy(FACE_getIFCo(f, nextLvl, S, x, 0), co);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
VertDataCopy(FACE_getIFCo(f, nextLvl, (S + 1) % f->numVerts, 0, x), co);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 0; x < gridSize - 1; x++) {
int eI = gridSize - 1 - x;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataCopy(FACE_getIFCo(f, nextLvl, S, cornerIdx, x), _edge_getCoVert(e, FACE_getVerts(f)[S], nextLvl, eI,vertDataSize));
VertDataCopy(FACE_getIFCo(f, nextLvl, S, x, cornerIdx), _edge_getCoVert(prevE, FACE_getVerts(f)[S], nextLvl, eI,vertDataSize));
}
}
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
static void ccgSubSurf__sync(CCGSubSurf *ss)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGVert **effectedV;
CCGEdge **effectedE;
CCGFace **effectedF;
int numEffectedV, numEffectedE, numEffectedF;
int subdivLevels = ss->subdivLevels;
int vertDataSize = ss->meshIFC.vertDataSize;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
int i, j, ptrIdx, S;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
int curLvl, nextLvl;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
void *q = ss->q, *r = ss->r;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
effectedV = MEM_mallocN(sizeof(*effectedV) * ss->vMap->numEntries, "CCGSubsurf effectedV");
effectedE = MEM_mallocN(sizeof(*effectedE) * ss->eMap->numEntries, "CCGSubsurf effectedE");
effectedF = MEM_mallocN(sizeof(*effectedF) * ss->fMap->numEntries, "CCGSubsurf effectedF");
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
numEffectedV = numEffectedE = numEffectedF = 0;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < ss->vMap->curSize; i++) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGVert *v = (CCGVert*) ss->vMap->buckets[i];
for (; v; v = v->next) {
if (v->flags&Vert_eEffected) {
effectedV[numEffectedV++] = v;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (j = 0; j < v->numEdges; j++) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGEdge *e = v->edges[j];
if (!(e->flags&Edge_eEffected)) {
effectedE[numEffectedE++] = e;
e->flags |= Edge_eEffected;
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (j = 0; j < v->numFaces; j++) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGFace *f = v->faces[j];
if (!(f->flags&Face_eEffected)) {
effectedF[numEffectedF++] = f;
f->flags |= Face_eEffected;
}
}
}
}
}
curLvl = 0;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
nextLvl = curLvl + 1;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (ptrIdx = 0; ptrIdx < numEffectedF; ptrIdx++) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGFace *f = effectedF[ptrIdx];
void *co = FACE_getCenterData(f);
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataZero(co);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < f->numVerts; i++) {
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataAdd(co, VERT_getCo(FACE_getVerts(f)[i], curLvl));
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataMulN(co, 1.0f/f->numVerts);
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
f->flags = 0;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (ptrIdx = 0; ptrIdx < numEffectedE; ptrIdx++) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGEdge *e = effectedE[ptrIdx];
void *co = EDGE_getCo(e, nextLvl, 1);
subsurfs EDGE_getSharpness function was looping when it didnt need to and also took an unused value. removed loop and unused var, since this is a sensitive (and not my) area - I did some mesh comparisons and ran a comparison with the old function passing random values, so this should be ok.
2007-06-09 10:51:02 +00:00
float sharpness = EDGE_getSharpness(e, curLvl);
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
2011-03-27 17:22:04 +00:00
if (_edge_isBoundary(e) || sharpness >= 1.0f) {
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataCopy(co, VERT_getCo(e->v0, curLvl));
VertDataAdd(co, VERT_getCo(e->v1, curLvl));
VertDataMulN(co, 0.5f);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
int numFaces = 0;
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataCopy(q, VERT_getCo(e->v0, curLvl));
VertDataAdd(q, VERT_getCo(e->v1, curLvl));
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < e->numFaces; i++) {
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
CCGFace *f = e->faces[i];
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataAdd(q, FACE_getCenterData(f));
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
numFaces++;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
VertDataMulN(q, 1.0f / (2.0f + numFaces));
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataCopy(r, VERT_getCo(e->v0, curLvl));
VertDataAdd(r, VERT_getCo(e->v1, curLvl));
VertDataMulN(r, 0.5f);
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataCopy(co, q);
VertDataSub(r, q);
VertDataMulN(r, sharpness);
VertDataAdd(co, r);
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
}
- bug fix, vertex normal calculation during incremental update was not correct (although fairly unnoticable). - bug fix, vertex normal calculation didn't normalize face normals before summing... silly mistake p.s. perhaps the Crystal Space bla bla naming conversation is not most appropriate for the commit list?
2005-06-23 23:44:22 +00:00
// edge flags cleared later
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (ptrIdx = 0; ptrIdx < numEffectedV; ptrIdx++) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGVert *v = effectedV[ptrIdx];
void *co = VERT_getCo(v, curLvl);
void *nCo = VERT_getCo(v, nextLvl);
- work-in-progress: subsurf level 0 now just acts like a regular mesh, before it would follow subsurf code path by creating fake displistmesh, etc... kinda fun for testing but just annoying now. - change to creasing behavior, to make sure that with full creasing effect is just simple subdivision.
2005-04-04 03:38:21 +00:00
int sharpCount = 0, allSharp = 1;
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
float avgSharpness = 0.0;
resolve some compiler warnings with intel c/c++ compiler * subsurf code had a lot of unused variables, removed these where they are obviously not needed. commented if they could be useful later. * some variables declorations hide existing variables (many of these left), but fixed some that could cause confusion. * removed unused vars * obscure python memory leak with colorband. * make_sample_tables had a loop running wasnt used. * if 0'd functions in arithb.c that are not used yet. * made many functions static
2008-09-29 17:08:11 +00:00
int seam = VERT_seam(v), seamEdges = 0;
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < v->numEdges; i++) {
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
CCGEdge *e = v->edges[i];
subsurfs EDGE_getSharpness function was looping when it didnt need to and also took an unused value. removed loop and unused var, since this is a sensitive (and not my) area - I did some mesh comparisons and ran a comparison with the old function passing random values, so this should be ok.
2007-06-09 10:51:02 +00:00
float sharpness = EDGE_getSharpness(e, curLvl);
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
if (seam && _edge_isBoundary(e))
seamEdges++;
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
if (sharpness!=0.0f) {
sharpCount++;
avgSharpness += sharpness;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- work-in-progress: subsurf level 0 now just acts like a regular mesh, before it would follow subsurf code path by creating fake displistmesh, etc... kinda fun for testing but just annoying now. - change to creasing behavior, to make sure that with full creasing effect is just simple subdivision.
2005-04-04 03:38:21 +00:00
allSharp = 0;
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (sharpCount) {
Bug #17912: fix for some SSS floating point precision issues, and also fix a divide by zero in the subsurf code found in the process.
2008-11-01 17:07:24 +00:00
avgSharpness /= sharpCount;
subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
2011-03-27 17:22:04 +00:00
if (avgSharpness > 1.0f) {
avgSharpness = 1.0f;
Bug #17912: fix for some SSS floating point precision issues, and also fix a divide by zero in the subsurf code found in the process.
2008-11-01 17:07:24 +00:00
}
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
}
Fix #25316: distorted subsurf UV in some cases. To counter distortion at seams, we add extra creasing in the UV mesh, to keep it from shrinking, leading to distorted UVs, but this wasn't always working right, so tweaked the conditions.
2011-01-05 12:04:06 +00:00
if (seamEdges < 2 || seamEdges != v->numEdges)
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
seam = 0;
- apply spike crease bug fix to ccgsubsurf
2005-04-01 02:52:55 +00:00
if (!v->numEdges) {
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataCopy(nCo, co);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else if (_vert_isBoundary(v)) {
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
int numBoundary = 0;
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataZero(r);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < v->numEdges; i++) {
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
CCGEdge *e = v->edges[i];
if (_edge_isBoundary(e)) {
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataAdd(r, VERT_getCo(_edge_getOtherVert(e, v), curLvl));
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
numBoundary++;
}
}
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataCopy(nCo, co);
subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
2011-03-27 17:22:04 +00:00
VertDataMulN(nCo, 0.75f);
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataMulN(r, 0.25f/numBoundary);
VertDataAdd(nCo, r);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
int numEdges = 0, numFaces = 0;
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataZero(q);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < v->numFaces; i++) {
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
CCGFace *f = v->faces[i];
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataAdd(q, FACE_getCenterData(f));
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
numFaces++;
}
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataMulN(q, 1.0f/numFaces);
VertDataZero(r);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < v->numEdges; i++) {
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
CCGEdge *e = v->edges[i];
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataAdd(r, VERT_getCo(_edge_getOtherVert(e, v), curLvl));
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
numEdges++;
}
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataMulN(r, 1.0f/numEdges);
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataCopy(nCo, co);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
VertDataMulN(nCo, numEdges - 2.0f);
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataAdd(nCo, q);
VertDataAdd(nCo, r);
VertDataMulN(nCo, 1.0f/numEdges);
- apply spike crease bug fix to ccgsubsurf
2005-04-01 02:52:55 +00:00
}
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
Fixed bug #8180, Simple subdivide modifier performs catmull-clark on single edges Removed an incorrect check for original vertices on whether any faces used them.
2008-03-21 03:08:04 +00:00
if (sharpCount>1 || seam) {
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataZero(q);
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
if (seam) {
avgSharpness = 1.0f;
sharpCount = seamEdges;
allSharp = 1;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < v->numEdges; i++) {
- apply spike crease bug fix to ccgsubsurf
2005-04-01 02:52:55 +00:00
CCGEdge *e = v->edges[i];
subsurfs EDGE_getSharpness function was looping when it didnt need to and also took an unused value. removed loop and unused var, since this is a sensitive (and not my) area - I did some mesh comparisons and ran a comparison with the old function passing random values, so this should be ok.
2007-06-09 10:51:02 +00:00
float sharpness = EDGE_getSharpness(e, curLvl);
- apply spike crease bug fix to ccgsubsurf
2005-04-01 02:52:55 +00:00
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
if (seam) {
if (_edge_isBoundary(e)) {
CCGVert *oV = _edge_getOtherVert(e, v);
VertDataAdd(q, VERT_getCo(oV, curLvl));
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else if (sharpness != 0.0f) {
- apply spike crease bug fix to ccgsubsurf
2005-04-01 02:52:55 +00:00
CCGVert *oV = _edge_getOtherVert(e, v);
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataAdd(q, VERT_getCo(oV, curLvl));
- apply spike crease bug fix to ccgsubsurf
2005-04-01 02:52:55 +00:00
}
}
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataMulN(q, (float) 1/sharpCount);
- apply spike crease bug fix to ccgsubsurf
2005-04-01 02:52:55 +00:00
- work-in-progress: subsurf level 0 now just acts like a regular mesh, before it would follow subsurf code path by creating fake displistmesh, etc... kinda fun for testing but just annoying now. - change to creasing behavior, to make sure that with full creasing effect is just simple subdivision.
2005-04-04 03:38:21 +00:00
if (sharpCount!=2 || allSharp) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
// q = q + (co-q) * avgSharpness
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataCopy(r, co);
VertDataSub(r, q);
VertDataMulN(r, avgSharpness);
VertDataAdd(q, r);
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
}
- apply spike crease bug fix to ccgsubsurf
2005-04-01 02:52:55 +00:00
// r = co*.75 + q*.25
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataCopy(r, co);
subsurf, derived mesh and other misc files: floats were being implicitly promoted to doubles, adjust to use floats.
2011-03-27 17:22:04 +00:00
VertDataMulN(r, 0.75f);
VertDataMulN(q, 0.25f);
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataAdd(r, q);
- apply spike crease bug fix to ccgsubsurf
2005-04-01 02:52:55 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
// nCo = nCo + (r-nCo) * avgSharpness
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataSub(r, nCo);
VertDataMulN(r, avgSharpness);
VertDataAdd(nCo, r);
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
}
- bug fix, vertex normal calculation during incremental update was not correct (although fairly unnoticable). - bug fix, vertex normal calculation didn't normalize face normals before summing... silly mistake p.s. perhaps the Crystal Space bla bla naming conversation is not most appropriate for the commit list?
2005-06-23 23:44:22 +00:00
// vert flags cleared later
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
if (ss->useAgeCounts) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedV; i++) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGVert *v = effectedV[i];
byte *userData = ccgSubSurf_getVertUserData(ss, v);
*((int*) &userData[ss->vertUserAgeOffset]) = ss->currentAge;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedE; i++) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGEdge *e = effectedE[i];
byte *userData = ccgSubSurf_getEdgeUserData(ss, e);
*((int*) &userData[ss->edgeUserAgeOffset]) = ss->currentAge;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedF; i++) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGFace *f = effectedF[i];
byte *userData = ccgSubSurf_getFaceUserData(ss, f);
*((int*) &userData[ss->faceUserAgeOffset]) = ss->currentAge;
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedE; i++) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGEdge *e = effectedE[i];
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataCopy(EDGE_getCo(e, nextLvl, 0), VERT_getCo(e->v0, nextLvl));
VertDataCopy(EDGE_getCo(e, nextLvl, 2), VERT_getCo(e->v1, nextLvl));
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedF; i++) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGFace *f = effectedF[i];
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (S = 0; S < f->numVerts; S++) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
CCGEdge *e = FACE_getEdges(f)[S];
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGEdge *prevE = FACE_getEdges(f)[(S + f->numVerts - 1) % f->numVerts];
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataCopy(FACE_getIFCo(f, nextLvl, S, 0, 0), FACE_getCenterData(f));
VertDataCopy(FACE_getIECo(f, nextLvl, S, 0), FACE_getCenterData(f));
VertDataCopy(FACE_getIFCo(f, nextLvl, S, 1, 1), VERT_getCo(FACE_getVerts(f)[S], nextLvl));
VertDataCopy(FACE_getIECo(f, nextLvl, S, 1), EDGE_getCo(FACE_getEdges(f)[S], nextLvl, 1));
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
- dropped user specified vertex data functions for ccgsubsurf, didn't really add value. hardcoded to use float[3] now.
2005-04-04 05:21:20 +00:00
VertDataCopy(FACE_getIFCo(f, nextLvl, S, 1, 0), _edge_getCoVert(e, FACE_getVerts(f)[S], nextLvl, 1, vertDataSize));
VertDataCopy(FACE_getIFCo(f, nextLvl, S, 0, 1), _edge_getCoVert(prevE, FACE_getVerts(f)[S], nextLvl, 1, vertDataSize));
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (curLvl = 1; curLvl < subdivLevels; curLvl++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
ccgSubSurf__calcSubdivLevel(ss,
effectedV, effectedE, effectedF,
numEffectedV, numEffectedE, numEffectedF, curLvl);
}
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
if (ss->calcVertNormals)
ccgSubSurf__calcVertNormals(ss,
effectedV, effectedE, effectedF,
numEffectedV, numEffectedE, numEffectedF);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (ptrIdx = 0; ptrIdx < numEffectedV; ptrIdx++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGVert *v = effectedV[ptrIdx];
v->flags = 0;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (ptrIdx = 0; ptrIdx < numEffectedE; ptrIdx++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGEdge *e = effectedE[ptrIdx];
e->flags = 0;
}
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
Fix for a memory leak in subsurf code that is using memory arena, temporary arrays are now allocated with regular guardedalloc.
2010-02-08 15:01:11 +00:00
MEM_freeN(effectedF);
MEM_freeN(effectedE);
MEM_freeN(effectedV);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
static void ccgSubSurf__allFaces(CCGSubSurf *ss, CCGFace ***faces, int *numFaces, int *freeFaces)
{
CCGFace **array;
int i, num;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (!*faces) {
array = MEM_mallocN(sizeof(*array) * ss->fMap->numEntries, "CCGSubsurf allFaces");
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
num = 0;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < ss->fMap->curSize; i++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGFace *f = (CCGFace*) ss->fMap->buckets[i];
for (; f; f = f->next)
array[num++] = f;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
*faces = array;
*numFaces = num;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
*freeFaces = 1;
}
else {
*freeFaces = 0;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
}
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
static void ccgSubSurf__effectedFaceNeighbours(CCGSubSurf *ss, CCGFace **faces, int numFaces, CCGVert ***verts, int *numVerts, CCGEdge ***edges, int *numEdges)
{
CCGVert **arrayV;
CCGEdge **arrayE;
int numV, numE, i, j;
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
arrayV = MEM_mallocN(sizeof(*arrayV) * ss->vMap->numEntries, "CCGSubsurf arrayV");
arrayE = MEM_mallocN(sizeof(*arrayE) * ss->eMap->numEntries, "CCGSubsurf arrayV");
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
numV = numE = 0;
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numFaces; i++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGFace *f = faces[i];
f->flags |= Face_eEffected;
}
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < ss->vMap->curSize; i++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGVert *v = (CCGVert*) ss->vMap->buckets[i];
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
for (; v; v = v->next) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (j = 0; j < v->numFaces; j++)
if (!(v->faces[j]->flags & Face_eEffected))
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
break;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (j == v->numFaces) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
arrayV[numV++] = v;
v->flags |= Vert_eEffected;
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
}
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < ss->eMap->curSize; i++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGEdge *e = (CCGEdge*) ss->eMap->buckets[i];
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
for (; e; e = e->next) {
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (j = 0; j < e->numFaces; j++)
if (!(e->faces[j]->flags & Face_eEffected))
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
break;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (j == e->numFaces) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
e->flags |= Edge_eEffected;
arrayE[numE++] = e;
}
}
}
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
*verts = arrayV;
*numVerts = numV;
*edges = arrayE;
*numEdges = numE;
}
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
/* copy face grid coordinates to other places */
CCGError ccgSubSurf_updateFromFaces(CCGSubSurf *ss, int lvl, CCGFace **effectedF, int numEffectedF)
{
int i, S, x, gridSize, cornerIdx, subdivLevels;
int vertDataSize = ss->meshIFC.vertDataSize, freeF;
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
subdivLevels = ss->subdivLevels;
lvl = (lvl)? lvl: subdivLevels;
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
gridSize = ccg_gridsize(lvl);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
cornerIdx = gridSize - 1;
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
ccgSubSurf__allFaces(ss, &effectedF, &numEffectedF, &freeF);
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedF; i++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGFace *f = effectedF[i];
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (S = 0; S < f->numVerts; S++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGEdge *e = FACE_getEdges(f)[S];
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGEdge *prevE = FACE_getEdges(f)[(S + f->numVerts - 1) % f->numVerts];
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataCopy(FACE_getCenterData(f), FACE_getIFCo(f, lvl, S, 0, 0));
VertDataCopy(VERT_getCo(FACE_getVerts(f)[S], lvl), FACE_getIFCo(f, lvl, S, cornerIdx, cornerIdx));
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 0; x < gridSize; x++)
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataCopy(FACE_getIECo(f, lvl, S, x), FACE_getIFCo(f, lvl, S, x, 0));
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 0; x < gridSize; x++) {
int eI = gridSize - 1 - x;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataCopy(_edge_getCoVert(e, FACE_getVerts(f)[S], lvl, eI,vertDataSize), FACE_getIFCo(f, lvl, S, cornerIdx, x));
VertDataCopy(_edge_getCoVert(prevE, FACE_getVerts(f)[S], lvl, eI,vertDataSize), FACE_getIFCo(f, lvl, S, x, cornerIdx));
- apply spike crease bug fix to ccgsubsurf
2005-04-01 02:52:55 +00:00
}
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
}
- apply spike crease bug fix to ccgsubsurf
2005-04-01 02:52:55 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (freeF) MEM_freeN(effectedF);
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
return eCCGError_None;
}
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
Sculpt Branch: multires conversion from 2.4 working again.
2009-12-11 10:56:20 +00:00
/* copy other places to face grid coordinates */
CCGError ccgSubSurf_updateToFaces(CCGSubSurf *ss, int lvl, CCGFace **effectedF, int numEffectedF)
{
int i, S, x, gridSize, cornerIdx, subdivLevels;
int vertDataSize = ss->meshIFC.vertDataSize, freeF;
subdivLevels = ss->subdivLevels;
lvl = (lvl)? lvl: subdivLevels;
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
gridSize = ccg_gridsize(lvl);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
cornerIdx = gridSize - 1;
Sculpt Branch: multires conversion from 2.4 working again.
2009-12-11 10:56:20 +00:00
ccgSubSurf__allFaces(ss, &effectedF, &numEffectedF, &freeF);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedF; i++) {
Sculpt Branch: multires conversion from 2.4 working again.
2009-12-11 10:56:20 +00:00
CCGFace *f = effectedF[i];
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (S = 0; S < f->numVerts; S++) {
int prevS = (S + f->numVerts - 1) % f->numVerts;
Sculpt Branch: multires conversion from 2.4 working again.
2009-12-11 10:56:20 +00:00
CCGEdge *e = FACE_getEdges(f)[S];
CCGEdge *prevE = FACE_getEdges(f)[prevS];
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 0; x < gridSize; x++) {
int eI = gridSize - 1 - x;
Sculpt Branch: multires conversion from 2.4 working again.
2009-12-11 10:56:20 +00:00
VertDataCopy(FACE_getIFCo(f, lvl, S, cornerIdx, x), _edge_getCoVert(e, FACE_getVerts(f)[S], lvl, eI,vertDataSize));
VertDataCopy(FACE_getIFCo(f, lvl, S, x, cornerIdx), _edge_getCoVert(prevE, FACE_getVerts(f)[S], lvl, eI,vertDataSize));
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 1; x < gridSize - 1; x++) {
Sculpt Branch: multires conversion from 2.4 working again.
2009-12-11 10:56:20 +00:00
VertDataCopy(FACE_getIFCo(f, lvl, S, 0, x), FACE_getIECo(f, lvl, prevS, x));
VertDataCopy(FACE_getIFCo(f, lvl, S, x, 0), FACE_getIECo(f, lvl, S, x));
}
VertDataCopy(FACE_getIFCo(f, lvl, S, 0, 0), FACE_getCenterData(f));
VertDataCopy(FACE_getIFCo(f, lvl, S, cornerIdx, cornerIdx), VERT_getCo(FACE_getVerts(f)[S], lvl));
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (freeF) MEM_freeN(effectedF);
Sculpt Branch: multires conversion from 2.4 working again.
2009-12-11 10:56:20 +00:00
return eCCGError_None;
}
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
/* stitch together face grids, averaging coordinates at edges
and vertices, for multires displacements */
CCGError ccgSubSurf_stitchFaces(CCGSubSurf *ss, int lvl, CCGFace **effectedF, int numEffectedF)
{
CCGVert **effectedV;
CCGEdge **effectedE;
int numEffectedV, numEffectedE, freeF;
int i, S, x, gridSize, cornerIdx, subdivLevels, edgeSize;
int vertDataSize = ss->meshIFC.vertDataSize;
- apply spike crease bug fix to ccgsubsurf
2005-04-01 02:52:55 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
subdivLevels = ss->subdivLevels;
lvl = (lvl)? lvl: subdivLevels;
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
gridSize = ccg_gridsize(lvl);
edgeSize = ccg_edgesize(lvl);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
cornerIdx = gridSize - 1;
- apply spike crease bug fix to ccgsubsurf
2005-04-01 02:52:55 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
ccgSubSurf__allFaces(ss, &effectedF, &numEffectedF, &freeF);
ccgSubSurf__effectedFaceNeighbours(ss, effectedF, numEffectedF,
&effectedV, &numEffectedV, &effectedE, &numEffectedE);
- apply spike crease bug fix to ccgsubsurf
2005-04-01 02:52:55 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
/* zero */
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedV; i++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGVert *v = effectedV[i];
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (v->numFaces)
Fix #29366: multires crash with meshes that had verts/edges not connected to any face.
2011-11-24 17:06:50 +00:00
VertDataZero(VERT_getCo(v, lvl));
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
- apply spike crease bug fix to ccgsubsurf
2005-04-01 02:52:55 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedE; i++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGEdge *e = effectedE[i];
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (e->numFaces)
for (x = 0; x < edgeSize; x++)
Fix #29366: multires crash with meshes that had verts/edges not connected to any face.
2011-11-24 17:06:50 +00:00
VertDataZero(EDGE_getCo(e, lvl, x));
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
/* add */
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedF; i++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGFace *f = effectedF[i];
- apply spike crease bug fix to ccgsubsurf
2005-04-01 02:52:55 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataZero(FACE_getCenterData(f));
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (S = 0; S < f->numVerts; S++)
for (x = 0; x < gridSize; x++)
Fix #20398: smooth brush + multires could still give problems at inner face edges.
2010-02-07 13:07:12 +00:00
VertDataZero(FACE_getIECo(f, lvl, S, x));
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (S = 0; S < f->numVerts; S++) {
int prevS = (S + f->numVerts - 1) % f->numVerts;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGEdge *e = FACE_getEdges(f)[S];
CCGEdge *prevE = FACE_getEdges(f)[prevS];
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataAdd(FACE_getCenterData(f), FACE_getIFCo(f, lvl, S, 0, 0));
Sculpt Branch: * Smooth brush works again for multires. * Optimal Display option for multires modifier, same as subsurf.
2009-12-09 13:37:19 +00:00
if (FACE_getVerts(f)[S]->flags&Vert_eEffected)
VertDataAdd(VERT_getCo(FACE_getVerts(f)[S], lvl), FACE_getIFCo(f, lvl, S, cornerIdx, cornerIdx));
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 1; x < gridSize - 1; x++) {
Fix #20398: smooth brush + multires could still give problems at inner face edges.
2010-02-07 13:07:12 +00:00
VertDataAdd(FACE_getIECo(f, lvl, S, x), FACE_getIFCo(f, lvl, S, x, 0));
VertDataAdd(FACE_getIECo(f, lvl, prevS, x), FACE_getIFCo(f, lvl, S, 0, x));
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 0; x < gridSize - 1; x++) {
int eI = gridSize - 1 - x;
Sculpt Branch: * Smooth brush works again for multires. * Optimal Display option for multires modifier, same as subsurf.
2009-12-09 13:37:19 +00:00
if (FACE_getEdges(f)[S]->flags&Edge_eEffected)
VertDataAdd(_edge_getCoVert(e, FACE_getVerts(f)[S], lvl, eI,vertDataSize), FACE_getIFCo(f, lvl, S, cornerIdx, x));
if (FACE_getEdges(f)[prevS]->flags&Edge_eEffected)
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (x != 0)
Sculpt Branch: * Smooth brush works again for multires. * Optimal Display option for multires modifier, same as subsurf.
2009-12-09 13:37:19 +00:00
VertDataAdd(_edge_getCoVert(prevE, FACE_getVerts(f)[S], lvl, eI,vertDataSize), FACE_getIFCo(f, lvl, S, x, cornerIdx));
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
}
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
/* average */
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedV; i++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGVert *v = effectedV[i];
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (v->numFaces)
Fix #29366: multires crash with meshes that had verts/edges not connected to any face.
2011-11-24 17:06:50 +00:00
VertDataMulN(VERT_getCo(v, lvl), 1.0f/v->numFaces);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedE; i++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGEdge *e = effectedE[i];
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataCopy(EDGE_getCo(e, lvl, 0), VERT_getCo(e->v0, lvl));
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
VertDataCopy(EDGE_getCo(e, lvl, edgeSize - 1), VERT_getCo(e->v1, lvl));
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (e->numFaces)
for (x = 1; x < edgeSize - 1; x++)
Fix #29366: multires crash with meshes that had verts/edges not connected to any face.
2011-11-24 17:06:50 +00:00
VertDataMulN(EDGE_getCo(e, lvl, x), 1.0f/e->numFaces);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
/* copy */
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedF; i++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGFace *f = effectedF[i];
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataMulN(FACE_getCenterData(f), 1.0f/f->numVerts);
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (S = 0; S < f->numVerts; S++)
for (x = 1; x < gridSize - 1; x++)
Fix #20398: smooth brush + multires could still give problems at inner face edges.
2010-02-07 13:07:12 +00:00
VertDataMulN(FACE_getIECo(f, lvl, S, x), 0.5f);
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (S = 0; S < f->numVerts; S++) {
int prevS = (S + f->numVerts - 1) % f->numVerts;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGEdge *e = FACE_getEdges(f)[S];
CCGEdge *prevE = FACE_getEdges(f)[prevS];
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataCopy(FACE_getIFCo(f, lvl, S, 0, 0), FACE_getCenterData(f));
VertDataCopy(FACE_getIFCo(f, lvl, S, cornerIdx, cornerIdx), VERT_getCo(FACE_getVerts(f)[S], lvl));
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 1; x < gridSize - 1; x++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataCopy(FACE_getIFCo(f, lvl, S, x, 0), FACE_getIECo(f, lvl, S, x));
VertDataCopy(FACE_getIFCo(f, lvl, S, 0, x), FACE_getIECo(f, lvl, prevS, x));
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (x = 0; x < gridSize - 1; x++) {
int eI = gridSize - 1 - x;
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataCopy(FACE_getIFCo(f, lvl, S, cornerIdx, x), _edge_getCoVert(e, FACE_getVerts(f)[S], lvl, eI,vertDataSize));
VertDataCopy(FACE_getIFCo(f, lvl, S, x, cornerIdx), _edge_getCoVert(prevE, FACE_getVerts(f)[S], lvl, eI,vertDataSize));
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
}
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
VertDataCopy(FACE_getIECo(f, lvl, S, 0), FACE_getCenterData(f));
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
VertDataCopy(FACE_getIECo(f, lvl, S, gridSize - 1), FACE_getIFCo(f, lvl, S, gridSize - 1, 0));
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
}
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
}
- change modifier applyModifier[EM] function to not free derived argument - added modifier_supportsMapping function - update CCG to set actual vertex normal (and not just interior face vertex normal, bla bla bla no one knows what this means nevermind). - renamed modifierType_get_info to modifierType_getInfo for consistency and to increase my commit line count. - update EditMeshDerivedMesh to calculate (and use new) normals when given deformed vertices - added - update editmode modifier calculation to also calculate a cage, not working 100% atm, in particular if a deformer follows a modifier that returns a DerivedMesh the cage is not accurate. - added ccg derivedmesh drawMapped{Vert,Face]NormalsEM functions - currently UI for selecting the cage mesh is rather irritating, will be updated
2005-08-03 04:04:05 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedV; i++)
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
effectedV[i]->flags = 0;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedE; i++)
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
effectedE[i]->flags = 0;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedF; i++)
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
effectedF[i]->flags = 0;
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
Fix for a memory leak in subsurf code that is using memory arena, temporary arrays are now allocated with regular guardedalloc.
2010-02-08 15:01:11 +00:00
MEM_freeN(effectedE);
MEM_freeN(effectedV);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (freeF) MEM_freeN(effectedF);
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
return eCCGError_None;
}
- change modifier applyModifier[EM] function to not free derived argument - added modifier_supportsMapping function - update CCG to set actual vertex normal (and not just interior face vertex normal, bla bla bla no one knows what this means nevermind). - renamed modifierType_get_info to modifierType_getInfo for consistency and to increase my commit line count. - update EditMeshDerivedMesh to calculate (and use new) normals when given deformed vertices - added - update editmode modifier calculation to also calculate a cage, not working 100% atm, in particular if a deformer follows a modifier that returns a DerivedMesh the cage is not accurate. - added ccg derivedmesh drawMapped{Vert,Face]NormalsEM functions - currently UI for selecting the cage mesh is rather irritating, will be updated
2005-08-03 04:04:05 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
/* update normals for specified faces */
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGError ccgSubSurf_updateNormals(CCGSubSurf *ss, CCGFace **effectedF, int numEffectedF)
{
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
CCGVert **effectedV;
CCGEdge **effectedE;
int i, numEffectedV, numEffectedE, freeF;
- change modifier applyModifier[EM] function to not free derived argument - added modifier_supportsMapping function - update CCG to set actual vertex normal (and not just interior face vertex normal, bla bla bla no one knows what this means nevermind). - renamed modifierType_get_info to modifierType_getInfo for consistency and to increase my commit line count. - update EditMeshDerivedMesh to calculate (and use new) normals when given deformed vertices - added - update editmode modifier calculation to also calculate a cage, not working 100% atm, in particular if a deformer follows a modifier that returns a DerivedMesh the cage is not accurate. - added ccg derivedmesh drawMapped{Vert,Face]NormalsEM functions - currently UI for selecting the cage mesh is rather irritating, will be updated
2005-08-03 04:04:05 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
ccgSubSurf__allFaces(ss, &effectedF, &numEffectedF, &freeF);
ccgSubSurf__effectedFaceNeighbours(ss, effectedF, numEffectedF,
&effectedV, &numEffectedV, &effectedE, &numEffectedE);
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
if (ss->calcVertNormals)
ccgSubSurf__calcVertNormals(ss,
effectedV, effectedE, effectedF,
numEffectedV, numEffectedE, numEffectedF);
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedV; i++)
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
effectedV[i]->flags = 0;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedE; i++)
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
effectedE[i]->flags = 0;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedF; i++)
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
effectedF[i]->flags = 0;
- bug fix, crash with edges with no face in subsurf
2005-06-24 05:30:41 +00:00
Fix for a memory leak in subsurf code that is using memory arena, temporary arrays are now allocated with regular guardedalloc.
2010-02-08 15:01:11 +00:00
MEM_freeN(effectedE);
MEM_freeN(effectedV);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (freeF) MEM_freeN(effectedF);
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
return eCCGError_None;
}
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
/* compute subdivision levels from a given starting point, used by
multires subdivide/propagate, by filling in coordinates at a
certain level, and then subdividing that up to the highest level */
CCGError ccgSubSurf_updateLevels(CCGSubSurf *ss, int lvl, CCGFace **effectedF, int numEffectedF)
{
CCGVert **effectedV;
CCGEdge **effectedE;
int numEffectedV, numEffectedE, freeF, i;
int curLvl, subdivLevels = ss->subdivLevels;
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
ccgSubSurf__allFaces(ss, &effectedF, &numEffectedF, &freeF);
ccgSubSurf__effectedFaceNeighbours(ss, effectedF, numEffectedF,
&effectedV, &numEffectedV, &effectedE, &numEffectedE);
- added vertex normal calculation functionality to CCG subsurf (CCGSS is fast, but can be rather tedious to work with...) - vertex normals for smooth faces draw correctly now... this code also switched to drawing with GL_QUAD_STRIP which can be quite a bit faster (depends how fast graphics card calcs lighting, I get 50% faster here)
2005-04-03 21:52:10 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (curLvl = lvl; curLvl < subdivLevels; curLvl++) {
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
ccgSubSurf__calcSubdivLevel(ss,
effectedV, effectedE, effectedF,
numEffectedV, numEffectedE, numEffectedF, curLvl);
- bug fix, vertex normal calculation during incremental update was not correct (although fairly unnoticable). - bug fix, vertex normal calculation didn't normalize face normals before summing... silly mistake p.s. perhaps the Crystal Space bla bla naming conversation is not most appropriate for the commit list?
2005-06-23 23:44:22 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedV; i++)
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
effectedV[i]->flags = 0;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedE; i++)
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
effectedE[i]->flags = 0;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < numEffectedF; i++)
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
effectedF[i]->flags = 0;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
Fix for a memory leak in subsurf code that is using memory arena, temporary arrays are now allocated with regular guardedalloc.
2010-02-08 15:01:11 +00:00
MEM_freeN(effectedE);
MEM_freeN(effectedV);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (freeF) MEM_freeN(effectedF);
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
return eCCGError_None;
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
Sculpt: CCGSubsurf new functions to update normals, update subdivision levels, copy coordinates from face grids, and stitch together face grids.
2009-11-25 12:27:21 +00:00
#undef VERT_getCo
#undef EDGE_getCo
#undef FACE_getIECo
#undef FACE_getIFCo
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
/*** External API accessor functions ***/
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getNumVerts(const CCGSubSurf *ss)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return ss->vMap->numEntries;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getNumEdges(const CCGSubSurf *ss)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return ss->eMap->numEntries;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getNumFaces(const CCGSubSurf *ss)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return ss->fMap->numEntries;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGVert *ccgSubSurf_getVert(CCGSubSurf *ss, CCGVertHDL v)
{
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
return (CCGVert*) _ehash_lookup(ss->vMap, v);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGEdge *ccgSubSurf_getEdge(CCGSubSurf *ss, CCGEdgeHDL e)
{
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
return (CCGEdge*) _ehash_lookup(ss->eMap, e);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGFace *ccgSubSurf_getFace(CCGSubSurf *ss, CCGFaceHDL f)
{
- Hacked in blender style creasing support to new subsurfs. I would like to have proper creasing (following what appears to be the informal standard in the subdivision surface literature) but I do not know when I will get to this or how complicated it will be. With this patch CCGSubSurfs should now have the same capabilities as regular subsurfs (barring possible bugs) and so replacing the old implementation is a reasonable possibility.
2005-03-22 06:11:25 +00:00
return (CCGFace*) _ehash_lookup(ss->fMap, f);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getSubdivisionLevels(const CCGSubSurf *ss)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return ss->subdivLevels;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getEdgeSize(const CCGSubSurf *ss)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return ccgSubSurf_getEdgeLevelSize(ss, ss->subdivLevels);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getEdgeLevelSize(const CCGSubSurf *ss, int level)
{
if (level<1 || level > ss->subdivLevels) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return -1;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
return ccg_edgesize(level);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getGridSize(const CCGSubSurf *ss)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return ccgSubSurf_getGridLevelSize(ss, ss->subdivLevels);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getGridLevelSize(const CCGSubSurf *ss, int level)
{
if (level<1 || level > ss->subdivLevels) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return -1;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
return ccg_gridsize(level);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
}
/* Vert accessors */
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGVertHDL ccgSubSurf_getVertVertHandle(CCGVert *v)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return v->vHDL;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getVertAge(CCGSubSurf *ss, CCGVert *v)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (ss->useAgeCounts) {
byte *userData = ccgSubSurf_getVertUserData(ss, v);
return ss->currentAge - *((int*) &userData[ss->vertUserAgeOffset]);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return 0;
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void *ccgSubSurf_getVertUserData(CCGSubSurf *ss, CCGVert *v)
{
return VERT_getLevelData(v) + ss->meshIFC.vertDataSize * (ss->subdivLevels + 1);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getVertNumFaces(CCGVert *v)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return v->numFaces;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGFace *ccgSubSurf_getVertFace(CCGVert *v, int index)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (index<0 || index>=v->numFaces) {
return NULL;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return v->faces[index];
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getVertNumEdges(CCGVert *v)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return v->numEdges;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGEdge *ccgSubSurf_getVertEdge(CCGVert *v, int index)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (index<0 || index>=v->numEdges) {
return NULL;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return v->edges[index];
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void *ccgSubSurf_getVertData(CCGSubSurf *ss, CCGVert *v)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return ccgSubSurf_getVertLevelData(ss, v, ss->subdivLevels);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void *ccgSubSurf_getVertLevelData(CCGSubSurf *ss, CCGVert *v, int level)
{
if (level<0 || level > ss->subdivLevels) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return NULL;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return _vert_getCo(v, level, ss->meshIFC.vertDataSize);
}
}
/* Edge accessors */
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGEdgeHDL ccgSubSurf_getEdgeEdgeHandle(CCGEdge *e)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return e->eHDL;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getEdgeAge(CCGSubSurf *ss, CCGEdge *e)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (ss->useAgeCounts) {
byte *userData = ccgSubSurf_getEdgeUserData(ss, e);
return ss->currentAge - *((int*) &userData[ss->edgeUserAgeOffset]);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return 0;
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void *ccgSubSurf_getEdgeUserData(CCGSubSurf *ss, CCGEdge *e)
{
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
return (EDGE_getLevelData(e) +
ss->meshIFC.vertDataSize * ccg_edgebase(ss->subdivLevels + 1));
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getEdgeNumFaces(CCGEdge *e)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return e->numFaces;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGFace *ccgSubSurf_getEdgeFace(CCGEdge *e, int index)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (index<0 || index>=e->numFaces) {
return NULL;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return e->faces[index];
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGVert *ccgSubSurf_getEdgeVert0(CCGEdge *e)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return e->v0;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGVert *ccgSubSurf_getEdgeVert1(CCGEdge *e)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return e->v1;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void *ccgSubSurf_getEdgeDataArray(CCGSubSurf *ss, CCGEdge *e)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return ccgSubSurf_getEdgeData(ss, e, 0);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void *ccgSubSurf_getEdgeData(CCGSubSurf *ss, CCGEdge *e, int x)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return ccgSubSurf_getEdgeLevelData(ss, e, x, ss->subdivLevels);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void *ccgSubSurf_getEdgeLevelData(CCGSubSurf *ss, CCGEdge *e, int x, int level)
{
if (level<0 || level > ss->subdivLevels) {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return NULL;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return _edge_getCo(e, level, x, ss->meshIFC.vertDataSize);
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
float ccgSubSurf_getEdgeCrease(CCGEdge *e)
{
Apply Subsurf to UV's. This fixes most of the UV distortion issues with subsurf. Near seams however there might still be some distortion, but this should at least not be worse than before. Subsurf UV is enabled by default on new meshes, and can be enabled in the modifier panel for existing ones. Before and after: http://users.pandora.be/blendix/notsmooth.png http://users.pandora.be/blendix/smooth.png
2006-01-10 11:36:57 +00:00
return e->crease;
}
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
/* Face accessors */
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGFaceHDL ccgSubSurf_getFaceFaceHandle(CCGSubSurf *UNUSED(ss), CCGFace *f)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return f->fHDL;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getFaceAge(CCGSubSurf *ss, CCGFace *f)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (ss->useAgeCounts) {
byte *userData = ccgSubSurf_getFaceUserData(ss, f);
return ss->currentAge - *((int*) &userData[ss->faceUserAgeOffset]);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return 0;
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void *ccgSubSurf_getFaceUserData(CCGSubSurf *ss, CCGFace *f)
{
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
int maxGridSize = ccg_gridsize(ss->subdivLevels);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
return FACE_getCenterData(f) + ss->meshIFC.vertDataSize * (1 + f->numVerts * maxGridSize + f->numVerts * maxGridSize * maxGridSize);
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getFaceNumVerts(CCGFace *f)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return f->numVerts;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGVert *ccgSubSurf_getFaceVert(CCGSubSurf *UNUSED(ss), CCGFace *f, int index)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (index<0 || index>=f->numVerts) {
return NULL;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return FACE_getVerts(f)[index];
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGEdge *ccgSubSurf_getFaceEdge(CCGSubSurf *UNUSED(ss), CCGFace *f, int index)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
if (index<0 || index>=f->numVerts) {
return NULL;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
else {
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return FACE_getEdges(f)[index];
}
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getFaceEdgeIndex(CCGFace *f, CCGEdge *e)
{
- added DerivedMesh.drawUVEdges function & implementations - removed DerivedMesh.drawLooseEdges and replaced with much more general drawEdgesFlag function that draws based edge flags. - switch DerivedMesh.drawFacesTex to give user control over which faces are drawn - added object_uvs_changed and object_tface_flags_changed functions to do object recalc flag flush/redraw queueing and added calls in appropriate places - added various edge flags to mark TFace information. This is used by the drawEdgesFlag routine and was the best way I could come up with to deal with drawing TFace information from modifier stack. Unfortunate side effects are (1) uses a lot of MEdge flags (although not needed in file so thats fine) and (2) requires recalculation of modifier stack on UV selection changes. #2 is disappointing but I could not find a better solution. - update UV mesh shadow drawing to use modifier result. At the moment just uses the final result but probably should be integrated with the editmode cage option. - convert draw_tfaces3D to use drawEdgesFlag routine which cleaned up the code quite a bit. - convert draw_tface_mesh to draw using result of modifier stack. Same comment about which result actually gets draw in FACESELECT mode as for UV editor shadow drawing applies. There is a still a bug in that selection is using the wrong mesh to draw.
2005-08-18 11:31:20 +00:00
int i;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
for (i = 0; i < f->numVerts; i++) {
if (FACE_getEdges(f)[i] == e) {
- added DerivedMesh.drawUVEdges function & implementations - removed DerivedMesh.drawLooseEdges and replaced with much more general drawEdgesFlag function that draws based edge flags. - switch DerivedMesh.drawFacesTex to give user control over which faces are drawn - added object_uvs_changed and object_tface_flags_changed functions to do object recalc flag flush/redraw queueing and added calls in appropriate places - added various edge flags to mark TFace information. This is used by the drawEdgesFlag routine and was the best way I could come up with to deal with drawing TFace information from modifier stack. Unfortunate side effects are (1) uses a lot of MEdge flags (although not needed in file so thats fine) and (2) requires recalculation of modifier stack on UV selection changes. #2 is disappointing but I could not find a better solution. - update UV mesh shadow drawing to use modifier result. At the moment just uses the final result but probably should be integrated with the editmode cage option. - convert draw_tfaces3D to use drawEdgesFlag routine which cleaned up the code quite a bit. - convert draw_tface_mesh to draw using result of modifier stack. Same comment about which result actually gets draw in FACESELECT mode as for UV editor shadow drawing applies. There is a still a bug in that selection is using the wrong mesh to draw.
2005-08-18 11:31:20 +00:00
return i;
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
}
}
- added DerivedMesh.drawUVEdges function & implementations - removed DerivedMesh.drawLooseEdges and replaced with much more general drawEdgesFlag function that draws based edge flags. - switch DerivedMesh.drawFacesTex to give user control over which faces are drawn - added object_uvs_changed and object_tface_flags_changed functions to do object recalc flag flush/redraw queueing and added calls in appropriate places - added various edge flags to mark TFace information. This is used by the drawEdgesFlag routine and was the best way I could come up with to deal with drawing TFace information from modifier stack. Unfortunate side effects are (1) uses a lot of MEdge flags (although not needed in file so thats fine) and (2) requires recalculation of modifier stack on UV selection changes. #2 is disappointing but I could not find a better solution. - update UV mesh shadow drawing to use modifier result. At the moment just uses the final result but probably should be integrated with the editmode cage option. - convert draw_tfaces3D to use drawEdgesFlag routine which cleaned up the code quite a bit. - convert draw_tface_mesh to draw using result of modifier stack. Same comment about which result actually gets draw in FACESELECT mode as for UV editor shadow drawing applies. There is a still a bug in that selection is using the wrong mesh to draw.
2005-08-18 11:31:20 +00:00
return -1;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void *ccgSubSurf_getFaceCenterData(CCGFace *f)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return FACE_getCenterData(f);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void *ccgSubSurf_getFaceGridEdgeDataArray(CCGSubSurf *ss, CCGFace *f, int gridIndex)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return ccgSubSurf_getFaceGridEdgeData(ss, f, gridIndex, 0);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void *ccgSubSurf_getFaceGridEdgeData(CCGSubSurf *ss, CCGFace *f, int gridIndex, int x)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return _face_getIECo(f, ss->subdivLevels, gridIndex, x, ss->subdivLevels, ss->meshIFC.vertDataSize);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void *ccgSubSurf_getFaceGridDataArray(CCGSubSurf *ss, CCGFace *f, int gridIndex)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return ccgSubSurf_getFaceGridData(ss, f, gridIndex, 0, 0);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void *ccgSubSurf_getFaceGridData(CCGSubSurf *ss, CCGFace *f, int gridIndex, int x, int y)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return _face_getIFCo(f, ss->subdivLevels, gridIndex, x, y, ss->subdivLevels, ss->meshIFC.vertDataSize);
}
/*** External API iterator functions ***/
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGVertIterator *ccgSubSurf_getVertIterator(CCGSubSurf *ss)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return (CCGVertIterator*) _ehashIterator_new(ss->vMap);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGEdgeIterator *ccgSubSurf_getEdgeIterator(CCGSubSurf *ss)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return (CCGEdgeIterator*) _ehashIterator_new(ss->eMap);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGFaceIterator *ccgSubSurf_getFaceIterator(CCGSubSurf *ss)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return (CCGFaceIterator*) _ehashIterator_new(ss->fMap);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGVert *ccgVertIterator_getCurrent(CCGVertIterator *vi)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return (CCGVert*) _ehashIterator_getCurrent((EHashIterator*) vi);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgVertIterator_isStopped(CCGVertIterator *vi)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return _ehashIterator_isStopped((EHashIterator*) vi);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void ccgVertIterator_next(CCGVertIterator *vi)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
_ehashIterator_next((EHashIterator*) vi);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void ccgVertIterator_free(CCGVertIterator *vi)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
_ehashIterator_free((EHashIterator*) vi);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGEdge *ccgEdgeIterator_getCurrent(CCGEdgeIterator *vi)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return (CCGEdge*) _ehashIterator_getCurrent((EHashIterator*) vi);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgEdgeIterator_isStopped(CCGEdgeIterator *vi)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return _ehashIterator_isStopped((EHashIterator*) vi);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void ccgEdgeIterator_next(CCGEdgeIterator *vi)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
_ehashIterator_next((EHashIterator*) vi);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void ccgEdgeIterator_free(CCGEdgeIterator *vi)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
_ehashIterator_free((EHashIterator*) vi);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
CCGFace *ccgFaceIterator_getCurrent(CCGFaceIterator *vi)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return (CCGFace*) _ehashIterator_getCurrent((EHashIterator*) vi);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgFaceIterator_isStopped(CCGFaceIterator *vi)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return _ehashIterator_isStopped((EHashIterator*) vi);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void ccgFaceIterator_next(CCGFaceIterator *vi)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
_ehashIterator_next((EHashIterator*) vi);
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
void ccgFaceIterator_free(CCGFaceIterator *vi)
{
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
_ehashIterator_free((EHashIterator*) vi);
}
/*** Extern API final vert/edge/face interface ***/
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getNumFinalVerts(const CCGSubSurf *ss)
{
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
int edgeSize = ccg_edgesize(ss->subdivLevels);
int gridSize = ccg_gridsize(ss->subdivLevels);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int numFinalVerts = (ss->vMap->numEntries +
ss->eMap->numEntries * (edgeSize - 2) +
ss->fMap->numEntries +
ss->numGrids * ((gridSize - 2) + ((gridSize - 2) * (gridSize - 2))));
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return numFinalVerts;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getNumFinalEdges(const CCGSubSurf *ss)
{
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
int edgeSize = ccg_edgesize(ss->subdivLevels);
int gridSize = ccg_gridsize(ss->subdivLevels);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int numFinalEdges = (ss->eMap->numEntries * (edgeSize - 1) +
ss->numGrids * ((gridSize - 1) + 2 * ((gridSize - 2) * (gridSize - 1))));
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return numFinalEdges;
}
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int ccgSubSurf_getNumFinalFaces(const CCGSubSurf *ss)
{
Code cleanup: replace some common CCG operations with functions. The new functions are ccg_gridsize, ccg_edgesize, ccg_spacing, and ccg_edgebase. These target most of the left-shift operations in the code.
2012-02-23 07:21:33 +00:00
int gridSize = ccg_gridsize(ss->subdivLevels);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
int numFinalFaces = ss->numGrids * ((gridSize - 1) * (gridSize - 1));
- Initial integration of CCGSubSurf library into blender. The lib is only in one C file and not worth dropping in extern but presumably will be synced with public CCGSubSurf release I hope to be making soon. - Currently the implementation must be enabled by defining USE_CCGSUBSURFLIB somewhere with your build system. The code should be considered highly experimental.
2005-03-21 01:34:27 +00:00
return numFinalFaces;
}
Copy Permalink