projects
/
vrtris
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
81ba28d
)
probably fixed loading
author
John Tsiombikas
<nuclear@member.fsf.org>
Fri, 1 Mar 2019 02:34:16 +0000
(
04:34
+0200)
committer
John Tsiombikas
<nuclear@member.fsf.org>
Fri, 1 Mar 2019 02:34:16 +0000
(
04:34
+0200)
src/cmesh.c
patch
|
blob
|
history
diff --git
a/src/cmesh.c
b/src/cmesh.c
index
6cf9b31
..
115f778
100644
(file)
--- a/
src/cmesh.c
+++ b/
src/cmesh.c
@@
-370,25
+370,29
@@
int cmesh_attrib_count(struct cmesh *cm, int attr)
int cmesh_push_attrib(struct cmesh *cm, int attr, float *v)
{
float *vptr;
int cmesh_push_attrib(struct cmesh *cm, int attr, float *v)
{
float *vptr;
- int i;
- int cursz = dynarr_size(cm->vattr[attr].data);
- int newsz = cursz + cm->vattr[attr].nelem;
+ int i, cursz, newsz;
+
+ if(!cm->vattr[attr].nelem) {
+ cm->vattr[attr].nelem = def_nelem[attr];
+ }
+ cursz = dynarr_size(cm->vattr[attr].data);
+ newsz = cursz + cm->vattr[attr].nelem;
if(!(vptr = dynarr_resize(cm->vattr[attr].data, newsz))) {
return -1;
}
cm->vattr[attr].data = vptr;
vptr += cursz;
if(!(vptr = dynarr_resize(cm->vattr[attr].data, newsz))) {
return -1;
}
cm->vattr[attr].data = vptr;
vptr += cursz;
- if(!cm->vattr[attr].nelem) {
- cm->vattr[attr].nelem = def_nelem[attr];
- }
-
for(i=0; i<cm->vattr[attr].nelem; i++) {
*vptr++ = *v++;
}
cm->vattr[attr].data_valid = 1;
cm->vattr[attr].vbo_valid = 0;
for(i=0; i<cm->vattr[attr].nelem; i++) {
*vptr++ = *v++;
}
cm->vattr[attr].data_valid = 1;
cm->vattr[attr].vbo_valid = 0;
+
+ if(attr == CMESH_ATTR_VERTEX) {
+ cm->nverts = newsz / cm->vattr[attr].nelem;
+ }
return 0;
}
return 0;
}
@@
-509,6
+513,8
@@
int cmesh_push_index(struct cmesh *cm, unsigned int idx)
cm->idata = iptr;
cm->idata_valid = 1;
cm->ibo_valid = 0;
cm->idata = iptr;
cm->idata_valid = 1;
cm->ibo_valid = 0;
+
+ cm->nfaces = dynarr_size(cm->idata) / 3;
return 0;
}
return 0;
}