diff --git a/wwiser/wgenerator.py b/wwiser/wgenerator.py index 6481aa5..3efcefa 100644 --- a/wwiser/wgenerator.py +++ b/wwiser/wgenerator.py @@ -183,13 +183,17 @@ def _report(self): if reb.get_missing_nodes_others(): missing = len(reb.get_missing_nodes_others()) logging.info("generator: WARNING! missing %i Wwise objects in other banks (load?)" % (missing)) - for bank in reb.get_missing_banks(): - logging.info("- %s.bnk" % (bank)) + for bankinfo in reb.get_missing_banks(): + logging.info("- %s.bnk" % (bankinfo)) if reb.get_missing_nodes_unknown(): missing = len(reb.get_missing_nodes_unknown()) logging.info("generator: WARNING! missing %i Wwise objects in unknown banks (load/ignore?)" % (missing)) + if reb.get_multiple_nodes(): + missing = len(reb.get_multiple_nodes()) + logging.info("generator: WARNING! repeated %i Wwise objects in multiple banks (load less?)" % (missing)) + if not txc.created: logging.info("generator: WARNING! no .txtp were created (find+load banks with events?)") diff --git a/wwiser/wrebuilder.py b/wwiser/wrebuilder.py index 1c892fc..46b1f61 100644 --- a/wwiser/wrebuilder.py +++ b/wwiser/wrebuilder.py @@ -22,6 +22,7 @@ def __init__(self): self._missing_nodes_loaded = {} # missing nodes that should be in loaded banks (event garbage left by Wwise) self._missing_nodes_others = {} # missing nodes in other banks (even pointing to other banks) self._missing_nodes_unknown = {} # missing nodes of unknown type + self._multiple_nodes = {} # nodes that exist but were loaded in multiple banks and can't decide which one is best self._loaded_banks = {} # id of banks that participate in generating self._missing_banks = {} # banks missing in the "others" list @@ -127,6 +128,9 @@ def get_missing_banks(self): def get_missing_media(self): return self._missing_media + def get_multiple_nodes(self): + return self._multiple_nodes + def get_transition_objects(self): return self._transition_objects @@ -179,7 +183,9 @@ def _get_node_by_ref(self, bank_id, sid): if not refs: return None if len(refs) > 1: - logging.info("generator: id %s found in multiple banks", sid) + # could try to figure out if nodes are equivalent before reporting? + logging.debug("generator: id %s found in multiple banks, not found in bank %s", sid, bank_id) + self._multiple_nodes[sid] = True ref = refs[0] node = self._ref_to_node.get(ref) return node diff --git a/wwiser/wversion.py b/wwiser/wversion.py index feaf1e5..58f212d 100644 --- a/wwiser/wversion.py +++ b/wwiser/wversion.py @@ -1,2 +1,2 @@ #autogenerated on build -WWISER_VERSION = "v20201202" +WWISER_VERSION = "v20201205"