Merge pull request #968 from Vavius/fix-moaiimagetexture

Attempt to fix MOAIImageTexture reallocated on each new glyph rendered

samples/test/textbox-dynamic-cache-allocs/main.lua

@@ -0,0 +1,38 @@
+----------------------------------------------------------------
+-- Copyright (c) 2010-2011 Zipline Games, Inc. 
+-- All Rights Reserved. 
+-- http://getmoai.com
+----------------------------------------------------------------
+
+MOAISim.openWindow ( "test", 320, 480 )
+
+viewport = MOAIViewport.new ()
+viewport:setSize ( 320, 480 )
+viewport:setScale ( 320, 480 )
+
+layer = MOAILayer2D.new ()
+layer:setViewport ( viewport )
+MOAISim.pushRenderPass ( layer )
+
+font = MOAIFont.new ()
+font:load ( 'arial-rounded.TTF' )
+
+function glyphAlloc ()
+	text = "Hello 123456789 qwertyuiopasdfghjklzxcvbnm QWERTYUIOPASDFGHJKLZXCVBNM"
+	local textbox = MOAITextBox.new ()
+	textbox:setFont ( font )
+	textbox:setString ( "as" )
+	textbox:setTextSize ( 64 )
+	textbox:setWordBreak ( MOAITextBox.WORD_BREAK_CHAR )
+	textbox:setRect ( -160, -240, 160, 240 )
+	textbox:setYFlip ( true )
+	layer:insertProp ( textbox )
+
+	for i = 1, #text do
+    	textbox:setString ( text:sub ( 1, i ))
+    	coroutine.yield ()
+	end
+end
+
+thread = MOAICoroutine.new ()
+thread:run ( glyphAlloc )

samples/test/textbox-dynamic-cache-allocs/run.bat

@@ -0,0 +1,33 @@
+::----------------------------------------------------------------::
+:: Copyright (c) 2010-2011 Zipline Games, Inc.
+:: All Rights Reserved.
+:: http://getmoai.com
+::----------------------------------------------------------------::
+
+@echo off
+
+:: verify paths
+if not exist "%MOAI_BIN%\moai.exe" (
+	echo.
+	echo --------------------------------------------------------------------------------
+	echo ERROR: The MOAI_BIN environment variable either doesn't exist or it's pointing
+	echo to an invalid path. Please point it at a folder containing moai.exe.
+	echo --------------------------------------------------------------------------------
+	echo.
+	goto end
+)
+
+if not exist "%MOAI_CONFIG%" (
+	echo.
+	echo -------------------------------------------------------------------------------
+	echo WARNING: The MOAI_CONFIG environment variable either doesn't exist or it's 
+	echo pointing to an invalid path. Please point it at a folder containing config.lua.
+	echo -------------------------------------------------------------------------------
+	echo.
+)
+
+:: run moai
+"%MOAI_BIN%\moai" "%MOAI_CONFIG%\config.lua" "main.lua"
+
+:end
+pause

samples/test/textbox-dynamic-cache-allocs/run.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+#--------------------------------------------------------------------------------------
+# Copyright (c) 2010-2013 Zipline Games, Inc.
+# All Rights Reserved.
+# http://getmoai.com
+#--------------------------------------------------------------------------------------
+
+cd `dirname $0`
+
+# Verify paths
+if [ ! -f "$MOAI_BIN/moai" ]; then
+    echo "---------------------------------------------------------------------------"
+    echo "Error: The MOAI_BIN environment variable doesn't exist or its pointing to an"
+    echo "invalid path.  Please point it at a folder containing moai executable"
+    echo "---------------------------------------------------------------------------"
+    exit 1
+fi
+
+if [ ! -f "$MOAI_CONFIG/config.lua" ]; then
+    echo "---------------------------------------------------------------------------"
+    echo "WARNING: The MOAI_CONFIG environment variable either doesn't exist or it's"
+    echo "pointing to an invalid path.  Please point it at a folder containing config.lua"
+    echo "---------------------------------------------------------------------------"
+    exit 1
+fi
+
+# Run moai
+$MOAI_BIN/moai $MOAI_CONFIG/config.lua main.lua

src/moai-sim/MOAIGfxResource.cpp

@@ -144,6 +144,15 @@ void MOAIGfxResource::Invalidate () {
 	}
 }
 
+//----------------------------------------------------------------//
+void MOAIGfxResource::InvalidateContents () {
+
+	if ( this->mState != STATE_ERROR ) {
+
+		this->mState = STATE_PRECREATE;
+	}
+}
+
 //----------------------------------------------------------------//
 void MOAIGfxResource::Load () {
 

src/moai-sim/MOAIGfxResource.h

@@ -75,6 +75,7 @@ class MOAIGfxResource :
 	void			Clear						();
 	void			Destroy						();
 	void			Invalidate					();
+	void			InvalidateContents			();
 	virtual bool	IsValid						() = 0; // return 'true' if the handle to the GPU-side resource is valid (or initialized) - GRAPHICS THREAD
 	void			Load						();
 					MOAIGfxResource				();

src/moai-sim/MOAIImageTexture.cpp

@@ -44,7 +44,7 @@ int MOAIImageTexture::_invalidate ( lua_State* L ) {
 void MOAIImageTexture::InvalidateAll () {
 
 	this->mStatus = INVALID;
- 	this->MOAIGfxResource::Load ();
+	this->MOAIGfxResource::InvalidateContents ();
 }
 
 //----------------------------------------------------------------//
@@ -63,7 +63,7 @@ void MOAIImageTexture::Invalidate ( ZLIntRect rect ) {
 	}
 	this->mStatus = INVALID_REGION;
 
-	this->MOAIGfxResource::Load ();
+	this->MOAIGfxResource::InvalidateContents ();
 }
 
 //----------------------------------------------------------------//