Skip to content

Commit 87a56dc

Browse files
committed
renames
1 parent 71faa58 commit 87a56dc

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

src/main/java/com/neuronrobotics/bowlerstudio/creature/ThumbnailImage.java

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,31 +69,36 @@ public Bounds getSellectedBounds() {
6969
return new Bounds(min, max);
7070
}
7171

72-
public WritableImage get(CSGDatabaseInstance instance, List<CSG> c) {
72+
public WritableImage get(CSGDatabaseInstance instance, List<CSG> incomingToDisplay) {
7373
ArrayList<CSG> csgList = new ArrayList<CSG>();
74-
for (CSG cs : c) {
75-
boolean containsKey = csgs.containsKey(cs.getName());
76-
csgs.put(cs.getName(), cs);
74+
for (CSG csg : incomingToDisplay) {
75+
boolean containsKey = csgs.containsKey(csg.getName());
76+
csgs.put(csg.getName(), csg);
7777
if (containsKey)
7878
continue;
79-
if (cs.hasManipulator()) {
79+
if (csg.isHide())
80+
continue;
81+
if (csg.isInGroup())
82+
continue;
83+
if (csg.hasManipulator()) {
8084
TransformNR nr;
81-
if(cs.hasManipulator())
85+
if(csg.hasManipulator())
8286
try {
83-
nr = TransformFactory.affineToNr(cs.getManipulator());
84-
csgList.add(cs.transformed(TransformFactory.nrToCSG(nr)).syncProperties(instance, cs));
87+
nr = TransformFactory.affineToNr(csg.getManipulator());
88+
csgList.add(csg.transformed(TransformFactory.nrToCSG(nr)).syncProperties(instance, csg));
8589
} catch (MissingManipulatorException e) {
8690
// TODO Auto-generated catch block
8791
e.printStackTrace();
8892
}
8993
} else
90-
csgList.add(cs);
94+
csgList.add(csg);
9195
}
9296
ArrayList<String> toRemove = new ArrayList<String>();
9397
for (String s : csgs.keySet()) {
9498
boolean exists = false;
95-
if (!(csgs.get(s).isHide()||csgs.get(s).isInGroup()))
96-
for (CSG cs : c) {
99+
CSG csg = csgs.get(s);
100+
if (!(csg.isHide()||csg.isInGroup()))
101+
for (CSG cs : incomingToDisplay) {
97102
if (cs.getName().contentEquals(s)) {
98103
exists = true;
99104
}

0 commit comments

Comments
 (0)