[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 @@
 -- @param the level.def lua table (result of dofile())
 validate.ValidateLevelDef = function(filename, gamedef, leveldef)
     local function Err(message)
         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' })
+    CheckValidKeys(filename, leveldef, { 'num_stars', 'shapes', 'script' })
 
     if leveldef.shapes then
-        local valid_keys = { 'start', 'finish', 'color', 'type', 'anchor', 'tag', 'dynamic' }
-        local valid_types = { 'line', 'edge' }
+        local valid_keys = { 'script', 'pos', 'children', 'sensor', 'image', 'start', 'finish', 'color', 'type', 'anchor', 'tag', 'dynamic' }
+        local valid_types = { 'compound', 'line', 'edge', 'image' }
         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)
-            end
-        end
-    end
-
 end
 
 if arg and #arg >= 1 then
    -- When run from the command line run validation on passed in game.def file.
    local filename = arg[1]
    if string.sub(filename, -4) == '.def' then
        local gamedef = util.LoadYaml(filename)
        gamedef.root = path.dirname(filename)
        validate.ValidateGameDef(filename, gamedef)
 
        -- Now validate all the levels in the game.
        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

[binji, 2013/05/21 21:11:36]

warn on no match? or do you do this to allow globbing?

[Sam Clegg, 2013/05/21 22:51:46]

The problem is that thee is no way to do "if __name__ == '__main__' in lua"  so
any lua executable at imports this
file will have this block executed.  Annoying.

 end
 
 return validate