ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/common/objutil.c
(Generate patch)

Comparing ray/src/common/objutil.c (file contents):
Revision 2.12 by greg, Fri Feb 12 20:44:04 2021 UTC vs.
Revision 2.13 by greg, Wed Mar 3 18:53:08 2021 UTC

# Line 44 | Line 44 | clearSelection(Scene *sc, int set)
44   void
45   selectGroup(Scene *sc, const char *gname, int invert)
46   {
47 <        int     gid = findName(gname, (const char **)sc->grpname, sc->ngrps);
47 >        int     gid = getGroupID(sc, gname);
48          Face    *f;
49  
50          if (gid < 0)
# Line 62 | Line 62 | selectGroup(Scene *sc, const char *gname, int invert)
62   void
63   selectMaterial(Scene *sc, const char *mname, int invert)
64   {
65 <        int     mid = findName(mname, (const char **)sc->matname, sc->nmats);
65 >        int     mid = getMaterialID(sc, mname);
66          Face    *f;
67          
68          if (mid < 0)
# Line 180 | Line 180 | chngFaceGroup(Scene *sc, Face *f, void *ptr)
180   int
181   changeGroup(Scene *sc, const char *gname, int flreq, int flexc)
182   {
183 <        int     grp = findName(gname, (const char **)sc->grpname, sc->ngrps);
183 >        int     grp = getGroupID(sc, gname);
184          if (grp < 0) {
185                  sc->grpname = chunk_alloc(char *, sc->grpname, sc->ngrps);
186                  sc->grpname[grp=sc->ngrps++] = savqstr((char *)gname);
# Line 203 | Line 203 | chngFaceMaterial(Scene *sc, Face *f, void *ptr)
203   int
204   changeMaterial(Scene *sc, const char *mname, int flreq, int flexc)
205   {
206 <        int     mat = findName(mname, (const char **)sc->matname, sc->nmats);
206 >        int     mat = getMaterialID(sc, mname);
207          if (mat < 0) {
208                  sc->matname = chunk_alloc(char *, sc->matname, sc->nmats);
209                  sc->matname[mat=sc->nmats++] = savqstr((char *)mname);
# Line 654 | Line 654 | addNormal(Scene *sc, double xn, double yn, double zn)
654   void
655   setGroup(Scene *sc, const char *nm)
656   {
657 <        sc->lastgrp = findName(nm, (const char **)sc->grpname, sc->ngrps);
657 >        sc->lastgrp = getGroupID(sc, nm);
658          if (sc->lastgrp >= 0)
659                  return;
660          sc->grpname = chunk_alloc(char *, sc->grpname, sc->ngrps);
# Line 665 | Line 665 | setGroup(Scene *sc, const char *nm)
665   void
666   setMaterial(Scene *sc, const char *nm)
667   {
668 <        sc->lastmat = findName(nm, (const char **)sc->matname, sc->nmats);
668 >        sc->lastmat = getMaterialID(sc, nm);
669          if (sc->lastmat >= 0)
670                  return;
671          sc->matname = chunk_alloc(char *, sc->matname, sc->nmats);

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)