fix Godot typo

fix syntax and schema
Removed color option as discussed and allowed multiple components to be listed

Author: andyb-unity

client_schema.json

@@ -103,28 +103,6 @@
                     "title": "Abbreviation shown in matrix",
                     "type": "string"
                 },
-                "color": {
-                    "title": "Background color used in matrix",
-                    "type": "string",
-                    "enum": [
-                        "black",
-                        "white",
-                        "gray",
-                        "silver",
-                        "maroon",
-                        "red",
-                        "purple",
-                        "fushsia",
-                        "green",
-                        "lime",
-                        "olive",
-                        "yellow",
-                        "navy",
-                        "blue",
-                        "teal",
-                        "aqua"
-                    ]
-                },
                 "extensions": {
                     "title": "Supported extensions",
                     "description": "A list of all supported extensions in this client, on this platform. Details or caveats may be included in 'notes'.",
@@ -137,7 +115,6 @@
             "required": [
                 "name",
                 "abbreviation",
-                "color",
                 "extensions"
             ]
         },

clients/godot.json

@@ -8,13 +8,12 @@
         "Linux (Desktop/Embedded)",
         "Android (All-in-one)",
         "Android (Phone/Installable)",
-        "MacOS (Desktop)"
+        "macOS (Desktop)"
     ],
     "components": [
         {
             "name": "Godot Core",
             "abbreviation": "Core",
-            "color": "green",
             "extensions": [
                 "XR_KHR_android_create_instance",
                 "XR_KHR_android_surface_swapchain",
@@ -57,7 +56,6 @@
         {
             "name": "Godot Vendors plugin",
             "abbreviation": "Vendors",
-            "color": "yellow",
             "extensions": [
                 "XR_FB_body_tracking",
                 "XR_FB_composition_layer_alpha_blend",

clients/unity.json

@@ -15,7 +15,7 @@
             "extensions": [
                 "XR_KHR_android_create_instance",
                 "XR_KHR_android_surface_swapchain",
-                "XR_KHR_android_thread_settings"
+                "XR_KHR_android_thread_settings",
                 "XR_KHR_composition_layer_depth",
                 "XR_KHR_D3D11_enable",
                 "XR_KHR_D3D12_enable",

openxr_inventory/client_inventory.py

@@ -20,9 +20,6 @@ class ComponentEntry:
     abbreviation: str
     """The abbreviation to use in the client matrix"""
 
-    color: str
-    """The color to use in the client matrix"""
-
     extensions: List[ExtensionEntry]
     """The supported extensions"""
 
@@ -32,7 +29,6 @@ def from_json(self, d: Dict) -> "ComponentEntry":
         return ComponentEntry(
             name=d["name"],
             abbreviation=d["abbreviation"],
-            color=d["color"],
             extensions=exts
         )
 
@@ -59,29 +55,27 @@ class ClientData:
     form_factors: List[FormFactorEntry]
     """The supported form factors"""
 
-    def get_component_for_extension(self, ext_name: str) -> Optional[ComponentEntry]:
+    def get_component_for_extension(self, ext_name: str) -> List[ComponentEntry]:
+        component_entries = []
         for component in self.components:
             for entry in component.extensions:
                 if entry.name == ext_name:
-                    return component
+                    component_entries += [ component ]
 
-        return None
+        return component_entries
 
-    def get_extension_entry(self, ext_name: str) -> Optional[ExtensionEntry]:
+    def get_extension_entry(self, ext_name: str) -> List[ExtensionEntry]:
         """
-        Get the entry for the named extension, if it exists.
+        Get the entries for the named extension, if they exists.
 
-        This can tell you if the runtime supports that extension, as well as any notes from the inventory.
+        This can tell you if the client supports that extension, as well as any notes from the inventory.
         """
         extension_entries = []
 
         for component in self.components:
             extension_entries += [ entry for entry in component.extensions if entry.name == ext_name ]
 
-        if not extension_entries:
-            return
-        assert len(extension_entries) == 1
-        return extension_entries[0]
+        return extension_entries
 
     @property
     def conformance_submission_url(self) -> Optional[str]:

openxr_inventory/extensions.py

@@ -201,8 +201,7 @@ def compute_extension_support(
 
         # Get all the client support
         for client in clients:
-            if client.get_extension_entry(extension_name):
-                client_count += 1
+            client_count += len(client.get_extension_entry(extension_name))
 
         # Filter out the empty ones
         extension_support[extension_name] = ExtensionSupport(runtime_count, client_count)

openxr_inventory/templates/extension_support.jinja2.html

@@ -309,9 +309,16 @@ <h2>Client support matrix</h2>
                         </a>
                     </th>
                     {% for client in clients | sort %}
-                        {% set component = client.get_component_for_extension(extension_name) %}
-                        {% if component %}
-                        <td class="text-center bg-success" style="background-color:{{ component.color }}"><span><abbr title="{{component.name}}">{{ component.abbreviation }}</abbr></span></td>
+                        {% set components = client.get_component_for_extension(extension_name) %}
+                        {% if components|length > 0 %}
+                        <td class="text-center bg-success">
+                            {% for component in components %}
+                            <span><abbr title="{{component.name}}">{{ component.abbreviation }}</abbr></span>
+                            {% if not loop.last %}
+                            <br>
+                            {% endif %}
+                            {% endfor %}
+                        </td>
                         {% else %}
                         <td class="text-center"><span class="glyphicon glyphicon-minus" style="opacity:0.1"></span><span class="sr-only">Not supported or not applicable</span></td>
                         {% endif %}