AfflictionNetworks/vilya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support tertiary & quaternary colors as added in nenya

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@884 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Dave Hoover
2009-12-05 00:56:10 +00:00
parent 3b06f339f9
commit e580adf522
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/stage/client/SceneColorizer.java
+4
View File
@@ -83,7 +83,10 @@ public class SceneColorizer implements TileSet.Colorizer
switch (index) { switch (index) {
case 0: colorId = oinfo.getPrimaryZation(); break; case 0: colorId = oinfo.getPrimaryZation(); break;
case 1: colorId = oinfo.getSecondaryZation(); break; case 1: colorId = oinfo.getSecondaryZation(); break;
case 2: colorId = oinfo.getTertiaryZation(); break;
case 3: colorId = oinfo.getQuaternaryZation(); break;
} }
if (colorId == 0) { if (colorId == 0) {
return SceneColorizer.this.getColorization(index, zation); return SceneColorizer.this.getColorization(index, zation);
} else { } else {
@@ -104,6 +107,7 @@ public class SceneColorizer implements TileSet.Colorizer
return c; return c;
} }
} }
return _cpos.getColorization(zation, getColorId(zation)); return _cpos.getColorization(zation, getColorId(zation));
} }
src/java/com/threerings/stage/tools/editor/ObjectEditorDialog.java
+14 -5
View File
@@ -80,6 +80,8 @@ public class ObjectEditorDialog extends EditorDialog
zations.add(new JLabel("Colorizations:")); zations.add(new JLabel("Colorizations:"));
zations.add(_primary = new JComboBox(NO_CHOICES)); zations.add(_primary = new JComboBox(NO_CHOICES));
zations.add(_secondary = new JComboBox(NO_CHOICES)); zations.add(_secondary = new JComboBox(NO_CHOICES));
zations.add(_tertiary = new JComboBox(NO_CHOICES));
zations.add(_quaternary = new JComboBox(NO_CHOICES));
panel.add(zations); panel.add(zations);
} }
@@ -116,6 +118,8 @@ public class ObjectEditorDialog extends EditorDialog
// if the object supports colorizations, configure those // if the object supports colorizations, configure those
Object[] pzations = null; Object[] pzations = null;
Object[] szations = null; Object[] szations = null;
Object[] tzations = null;
Object[] qzations = null;
if (tset != null) { if (tset != null) {
String[] zations = null; String[] zations = null;
if (tset instanceof RecolorableTileSet) { if (tset instanceof RecolorableTileSet) {
@@ -124,10 +128,14 @@ public class ObjectEditorDialog extends EditorDialog
if (zations != null) { if (zations != null) {
pzations = computeZations(zations, 0); pzations = computeZations(zations, 0);
szations = computeZations(zations, 1); szations = computeZations(zations, 1);
tzations = computeZations(zations, 2);
qzations = computeZations(zations, 3);
} }
} }
configureZations(_primary, pzations, _scobj.info.getPrimaryZation()); configureZations(_primary, pzations, _scobj.info.getPrimaryZation());
configureZations(_secondary, szations, _scobj.info.getSecondaryZation()); configureZations(_secondary, szations, _scobj.info.getSecondaryZation());
configureZations(_tertiary, tzations, _scobj.info.getTertiaryZation());
configureZations(_quaternary, qzations, _scobj.info.getQuaternaryZation());
// select the text edit field and focus it // select the text edit field and focus it
_action.setCaretPosition(0); _action.setCaretPosition(0);
@@ -173,7 +181,6 @@ public class ObjectEditorDialog extends EditorDialog
@Override @Override
public void accepted () public void accepted ()
{ {
_scobj.info.action = _action.getText(); _scobj.info.action = _action.getText();
byte prio = (byte)_priority.getValue(); byte prio = (byte)_priority.getValue();
if (prio != _scobj.getPriority()) { if (prio != _scobj.getPriority()) {
@@ -183,7 +190,9 @@ public class ObjectEditorDialog extends EditorDialog
int ozations = _scobj.info.zations; int ozations = _scobj.info.zations;
ZationChoice pchoice = (ZationChoice)_primary.getSelectedItem(); ZationChoice pchoice = (ZationChoice)_primary.getSelectedItem();
ZationChoice schoice = (ZationChoice)_secondary.getSelectedItem(); ZationChoice schoice = (ZationChoice)_secondary.getSelectedItem();
_scobj.info.setZations(pchoice.colorId, schoice.colorId); ZationChoice tchoice = (ZationChoice)_tertiary.getSelectedItem();
ZationChoice qchoice = (ZationChoice)_quaternary.getSelectedItem();
_scobj.info.setZations(pchoice.colorId, schoice.colorId, tchoice.colorId, qchoice.colorId);
if (ozations != _scobj.info.zations) { if (ozations != _scobj.info.zations) {
_scobj.refreshObjectTile(_panel); _scobj.refreshObjectTile(_panel);
} }
@@ -202,12 +211,12 @@ public class ObjectEditorDialog extends EditorDialog
protected static class ZationChoice protected static class ZationChoice
implements Comparable<ZationChoice> implements Comparable<ZationChoice>
{ {
public short colorId; public byte colorId;
public String name; public String name;
public ZationChoice (int colorId, String name) public ZationChoice (int colorId, String name)
{ {
this.colorId = (short)colorId; this.colorId = (byte)colorId;
this.name = name; this.name = name;
} }
@@ -226,7 +235,7 @@ public class ObjectEditorDialog extends EditorDialog
protected JTextField _action; protected JTextField _action;
protected JSlider _priority; protected JSlider _priority;
protected SceneObject _scobj; protected SceneObject _scobj;
protected JComboBox _primary, _secondary; protected JComboBox _primary, _secondary, _tertiary, _quaternary;
protected static final ZationChoice[] NO_CHOICES = new ZationChoice[] { new ZationChoice(0, protected static final ZationChoice[] NO_CHOICES = new ZationChoice[] { new ZationChoice(0,
"none") }; "none") };