removed old TKTexturePack class

TKFrameInfo.lua

@@ -0,0 +1,17 @@
+module(..., package.seeall)
+
+
+TKFrameInfo = {}
+
+function TKFrameInfo:new ( o )
+   o = o or {}
+   setmetatable ( o, self )
+   self.__index = self
+   return o
+end
+
+function TKFrameInfo:init ()
+   return self
+end
+
+return TKFrameInfo

TKLayer.lua

@@ -36,15 +36,14 @@ function TKLayer:fill ( params )
 end
 
 function TKLayer:fillScalableLayout ( params )
-   if params.texturePack then
-      params.deck = params.texturePack.quads
-      params.resourceScaleFactor = params.texturePack.resourceScaleFactor
-   end
    self.layoutWidth = params.resource.layout_width
    self.layoutHeight = params.resource.layout_height
    for i, propTable in ipairs ( params.resource.props ) do
       if params.texturePack then
-	 params.index = params.texturePack.spriteNames [ propTable.name ]
+	 local frameInfo = params.texturePack:getFrameInfo ( propTable.name )
+	 params.index = frameInfo.index
+	 params.deck = frameInfo.quads
+	 params.resourceScaleFactor = frameInfo.resourceScaleFactor
       end
       params.propTable = propTable
       self:addScalableProp ( params )

TKResourceManager.lua

@@ -3,6 +3,7 @@ module(..., package.seeall)
 
 local TKScreen = require ( 'terevaka/TKScreen' )
 local TKTexturePackerUtil = require ( 'terevaka/TKTexturePackerUtil' )
+local TKTextureMultiPack = require ( 'terevaka/TKTextureMultiPack' )
 
 local layoutFileNameCache = {}
 local drawableDirs = {}
@@ -13,7 +14,10 @@ function loadTexturePack ( packName )
    local spec = drawable.resourceDir..packName..'.lua'
    local pack = TKTexturePackerUtil.load ( spec, drawable.path )
    pack.resourceScaleFactor = drawable.resourceScaleFactor
-   return pack
+
+   local multiPack = TKTextureMultiPack:new () :init ()
+   multiPack:addTexturePack ( pack )
+   return multiPack
 end
 
 function loadTexture ( name, ext )

TKTextureMultiPack.lua

@@ -0,0 +1,41 @@
+module(..., package.seeall)
+
+TKTextureMultiPack = {}
+
+function TKTextureMultiPack:new ( o )
+   o = o or {}
+   setmetatable ( o, self )
+   self.__index = self
+   return o
+end
+
+function TKTextureMultiPack:init ()
+   self.texturePacks = {}
+   return self
+end
+
+function TKTextureMultiPack:addTexturePack ( pack )
+   table.insert ( self.texturePacks, pack )
+end
+
+function TKTextureMultiPack:getFrameInfo ( frameName )
+   for i, pack in ipairs ( self.texturePacks ) do
+      if pack.spriteNames [ frameName ] then
+	 local frameInfo = {}
+	 frameInfo.frameName = frameName
+	 frameInfo.quads = pack.quads
+	 frameInfo.resourceScaleFactor = pack.resourceScaleFactor
+	 frameInfo.index = pack.spriteNames [ frameName ]
+	 return frameInfo
+      end
+   end
+end
+
+function TKTextureMultiPack:release ()
+   for i, pack in ipairs ( self.texturePacks ) do
+      pack.texture:release ()
+   end
+   self.texturePacks = {}
+end
+
+return TKTextureMultiPack

TKTexturePackerUtil.lua

@@ -1,14 +1,13 @@
 module(..., package.seeall)
 
-local TKTexturePack = require ( 'terevaka/TKTexturePack' )
 
 function load( lua, png )
-   local texturePack = TKTexturePack:new () :init ()
+   local textureTable = {}
    local frames = dofile ( lua ).frames
 
-   texturePack.texture = MOAITexture.new ()
-   texturePack.texture:load ( png )
-   local xtex, ytex = texturePack.texture:getSize ()
+   textureTable.texture = MOAITexture.new ()
+   textureTable.texture:load ( png )
+   local xtex, ytex = textureTable.texture:getSize ()
 
    -- Annotate the frame array with uv quads and geometry rects
    for i, frame in ipairs ( frames ) do
@@ -43,18 +42,18 @@ function load( lua, png )
    end
 
    -- Construct the deck
-   texturePack.quads = MOAIGfxQuadDeck2D.new ()
-   texturePack.quads:setTexture ( texturePack.texture )
-   texturePack.quads:reserve ( #frames )
+   textureTable.quads = MOAIGfxQuadDeck2D.new ()
+   textureTable.quads:setTexture ( textureTable.texture )
+   textureTable.quads:reserve ( #frames )
    local names = {}
    for i, frame in ipairs ( frames ) do
       local q = frame.uvQuad
       local r = frame.geomRect
       names[frame.name] = i
-      texturePack.quads:setUVQuad ( i, q.x0,q.y0, q.x1,q.y1, q.x2,q.y2, q.x3,q.y3 )
-      texturePack.quads:setRect ( i, r.x0,r.y0, r.x1,r.y1 )
+      textureTable.quads:setUVQuad ( i, q.x0,q.y0, q.x1,q.y1, q.x2,q.y2, q.x3,q.y3 )
+      textureTable.quads:setRect ( i, r.x0,r.y0, r.x1,r.y1 )
    end
 
-   texturePack.spriteNames = names
-   return texturePack
+   textureTable.spriteNames = names
+   return textureTable
 end

terevaka.lua

@@ -9,3 +9,4 @@ TKTexturePackerUtil = require ( 'terevaka/TKTexturePackerUtil' )
 TKScene = require ( 'terevaka/TKScene' )
 TKTapEvent = require ( 'terevaka/TKTapEvent' )
 TKTexturePack = require ( 'terevaka/TKTexturePack' )
+TKTextureMultiPack = require ( 'terevaka/TKTextureMultiPack' )