From ade2d7b79be14e9b3fd83eba83279273a5436774 Mon Sep 17 00:00:00 2001 From: Mark Johnson Date: Tue, 27 Jun 2006 20:50:08 +0000 Subject: [PATCH] Allow controllers to specify the name of the node they will attach to, by default use the same name as the controller git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@8 ed5b42cb-e716-0410-a449-f6a68f950b19 --- src/java/com/threerings/jme/tools/ModelDef.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/java/com/threerings/jme/tools/ModelDef.java b/src/java/com/threerings/jme/tools/ModelDef.java index 84f2f3fd..c0234089 100644 --- a/src/java/com/threerings/jme/tools/ModelDef.java +++ b/src/java/com/threerings/jme/tools/ModelDef.java @@ -464,15 +464,15 @@ public class ModelDef String[] controllers = StringUtil.parseStringArray( props.getProperty("controllers", "")); for (int ii = 0; ii < controllers.length; ii++) { - Spatial target = nodes.get(controllers[ii]); + Properties subProps = + PropertiesUtil.getSubProperties(props, controllers[ii]); + String node = subProps.getProperty("node", controllers[ii]); + Spatial target = nodes.get(node); if (target == null) { - Log.warning("Missing controller node [name=" + - controllers[ii] + "]."); + Log.warning("Missing controller node [name=" + node + "]."); continue; } - ModelController ctrl = createController( - PropertiesUtil.getSubProperties(props, controllers[ii]), - target); + ModelController ctrl = createController(subProps, target); if (ctrl != null) { model.addController(ctrl); }