[nacltoons] Add compound shapes.

nacltoons/data/res/validate.lua

 -- Copyright (c) 2013 The Chromium Authors. All rights reserved.
 -- Use of this source code is governed by a BSD-style license that can be
 -- found in the LICENSE file.
 
 -- Functions for validating game data files (.def files).
 -- This module provides a single global called 'validate' which
 -- contains two function:
 --   ValidateGameDef
 --   ValidateLevelDef
 --
@@ skipping 75 matching lines @@
         Error(filename, message)
     end
 
     if type(leveldef) ~= 'table' then
         return Err("file does not evaluate to an object of type 'table'")
     end
 
     CheckValidKeys(filename, leveldef, { 'num_stars', 'shapes', 'sprites', 'script' })
 
     if leveldef.shapes then
-        local valid_keys = { 'start', 'finish', 'color', 'type', 'anchor', 'tag', 'dynamic' }
-        local valid_types = { 'line', 'edge' }
+        local valid_keys = { 'pos', 'children', 'start', 'finish', 'color', 'type', 'anchor', 'tag', 'dynamic' }
+        local valid_types = { 'compound', 'line', 'edge' }
         local required_keys = { 'type' }
-        for _, shape in pairs(leveldef.shapes) do
-            CheckValidKeys(filename, shape, valid_keys)
-            CheckRequiredKeys(filename, shape, required_keys, 'shape')
-            if not ListContains(valid_types, shape.type) then
-                Err('invalid shape type: ' .. shape.type)
+
+        local function ValidateShapeList(shapes)
+            for _, shape in pairs(shapes) do
+                if #shape > 0 then
+                    ValidateShapeList(shape)
+                else
+                    CheckValidKeys(filename, shape, valid_keys)
+                    CheckRequiredKeys(filename, shape, required_keys, 'shape')
+                    if not ListContains(valid_types, shape.type) then
+                        Err('invalid shape type: ' .. shape.type)
+                    end
+                end
             end
         end
+
+        ValidateShapeList(leveldef.shapes)
     end
 
     if leveldef.sprites then
         local valid_keys = { 'pos', 'tag', 'image', 'script', 'sensor' }
         local required_keys = { 'pos', 'image' }
         for _, sprite in pairs(leveldef.sprites) do
             CheckValidKeys(filename, sprite, valid_keys)
             CheckRequiredKeys(filename, sprite, required_keys, 'sprite')
             if gamedef.assets[sprite.image] == nil then
                 Err('invalid image asset: ' .. sprite.image)
@@ skipping 14 matching lines @@
    for _, level in ipairs(gamedef.levels) do
        filename = path.join(gamedef.root, level)
        level = util.LoadYaml(filename)
        validate.ValidateLevelDef(filename, gamedef, level)
    end
 
    print("Validation successful!")
 end
 
 return validate