OGRE (O-O Graphics Rendering Engine)

Update of /cvsroot/ogre/ogrenew/OgreMain/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5218/OgreMain/src

Modified Files:
      Tag: resource-unstable
	OgreEventProcessor.cpp 
Log Message:
Fix EventProcessor

Index: OgreEventProcessor.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/src/OgreEventProcessor.cpp,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -C2 -d -r1.10 -r1.10.4.1
*** OgreEventProcessor.cpp	24 Oct 2004 02:24:35 -0000	1.10
--- OgreEventProcessor.cpp	30 Nov 2004 23:39:35 -0000	1.10.4.1
***************
*** 34,37 ****
--- 34,38 ----
  #include "OgreInput.h"
  #include "OgreCursor.h"
+ #include "OgrePlatformManager.h"

Update of /cvsroot/ogre/ogrenew/PlugIns/OctreeSceneManager/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26523/src

Modified Files:
      Tag: Hastur
	OgreTerrainSceneManager.cpp 
Log Message:
Fixed crash when you clear the terrain scene but don't call setWorldGeometry again

Index: OgreTerrainSceneManager.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/PlugIns/OctreeSceneManager/src/OgreTerrainSceneManager.cpp,v
retrieving revision 1.37.4.1
retrieving revision 1.37.4.2
diff -C2 -d -r1.37.4.1 -r1.37.4.2
*** OgreTerrainSceneManager.cpp	29 Oct 2004 23:01:48 -0000	1.37.4.1
--- OgreTerrainSceneManager.cpp	30 Nov 2004 22:47:28 -0000	1.37.4.2
***************
*** 440,444 ****
      {
          // For now, no paging and expect immediate response
!         if (mTerrainPages[0][0] == 0)
          {
              mActivePageSource->requestPage(0, 0);
--- 440,444 ----
      {
          // For now, no paging and expect immediate response
!         if (!mTerrainPages.empty() && mTerrainPages[0][0] == 0)
          {
              mActivePageSource->requestPage(0, 0);

Update of /cvsroot/ogre/ogrenew/OgreMain/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19021

Added Files:
      Tag: resource-unstable
	OgreResource.cpp OgreResourceGroupManager.cpp 
Log Message:
Added a couple of missing files

--- NEW FILE: OgreResource.cpp ---
/*
-----------------------------------------------------------------------------
This source file is part of OGRE
(Object-oriented Graphics Rendering Engine)
For the latest info, see http://ogre.sourceforge.net/

Copyright © 2000-2004 The OGRE Team
Also see acknowledgements in Readme.html

This program is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any later
version.

This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public License along with
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place - Suite 330, Boston, MA 02111-1307, USA, or go to
http://www.gnu.org/copyleft/lesser.txt.
-----------------------------------------------------------------------------
*/
// Ogre includes
#include "OgreStableHeaders.h"

#include "OgreResource.h"
#include "OgreResourceManager.h"

namespace Ogre 
{
	//-----------------------------------------------------------------------
	Resource::Resource(ResourceManager* creator, const String& name, ResourceHandle handle,
		const String& group, bool isManual, ManualResourceLoader* loader)
		: mCreator(creator), mName(name), mGroup(group), mHandle(handle), 
		mIsLoaded(false), mSize(0), mIsManual(isManual), mLoader(loader)
	{
	}
	//-----------------------------------------------------------------------
	Resource::~Resource() 
	{ 
		unload(); 
	}
	//-----------------------------------------------------------------------
	void Resource::load(void)
	{
		if (!mIsLoaded)
		{
			if (mIsManual)
			{
				// Load from manual loader
				if (mLoader)
				{
					mLoader->loadResource(this);
				}
			}
			else
			{
				loadImpl();
			}
			mIsLoaded = true;
		}

	}
	//-----------------------------------------------------------------------
	void Resource::unload(void) 
	{ 
		if (mIsLoaded)
		{
			unloadImpl();
			mIsLoaded = false;
		}
	}
	//-----------------------------------------------------------------------
	void Resource::reload(void) 
	{ 
		if (mIsLoaded)
		{
			unload();
			load();
		}
	}
	//-----------------------------------------------------------------------
	void Resource::touch(void) 
	{
		mCreator->_notifyResourceTouched(this);
	}
	//-----------------------------------------------------------------------


}

--- NEW FILE: OgreResourceGroupManager.cpp ---
/*
-----------------------------------------------------------------------------
This source file is part of OGRE
(Object-oriented Graphics Rendering Engine)
For the latest info, see http://www.ogre3d.org/

Copyright © 2000-2004 The OGRE Team
Also see acknowledgements in Readme.html

This program is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any later
version.

This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public License along with
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place - Suite 330, Boston, MA 02111-1307, USA, or go to
http://www.gnu.org/copyleft/lesser.txt.
-----------------------------------------------------------------------------
*/
#include "OgreStableHeaders.h"
#include "OgreResourceGroupManager.h"
#include "OgreException.h"
#include "OgreArchiveManager.h"
#include "OgreLogManager.h"

namespace Ogre {

    //-----------------------------------------------------------------------
    template<> ResourceGroupManager* Singleton<ResourceGroupManager>::ms_Singleton = 0;
    ResourceGroupManager* ResourceGroupManager::getSingletonPtr(void)
    {
        return ms_Singleton;
    }
    ResourceGroupManager& ResourceGroupManager::getSingleton(void)
    {  
        assert( ms_Singleton );  return ( *ms_Singleton );  
    }
	String ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME = "General";
    String ResourceGroupManager::WORLD_RESOURCE_GROUP_NAME = "World";
    //-----------------------------------------------------------------------
    //-----------------------------------------------------------------------
    ResourceGroupManager::ResourceGroupManager()
        : mCurrentGroup(0)
    {
        // Create the 'General' group
        ResourceGroup* grp = new ResourceGroup();
        grp->name = DEFAULT_RESOURCE_GROUP_NAME;
        mResourceGroupMap.insert(
            ResourceGroupMap::value_type(grp->name, grp));
    }
    //-----------------------------------------------------------------------
    ResourceGroupManager::~ResourceGroupManager()
    {
        // delete all resource groups
        ResourceGroupMap::iterator i, iend;
        iend = mResourceGroupMap.end();
        for (i = mResourceGroupMap.begin(); i != iend; ++i)
        {
			deleteGroup(i->second);
        }
        mResourceGroupMap.clear();
    }
    //-----------------------------------------------------------------------
    void ResourceGroupManager::createResourceGroup(const String& name)
    {
		LogManager::getSingleton().logMessage("Creating resource group " + name);
        if (getResourceGroup(name))
        {
            Except(Exception::ERR_DUPLICATE_ITEM, 
                "Resource group with name '" + name + "' already exists!", 
                "ResourceGroupManager::createResourceGroup");
        }
        ResourceGroup* grp = new ResourceGroup();
        grp->name = name;
        mResourceGroupMap.insert(
            ResourceGroupMap::value_type(name, grp));
    }
	//-----------------------------------------------------------------------
	void ResourceGroupManager::initialiseResourceGroup(const String& name)
	{
		LogManager::getSingleton().logMessage("Initialising resource group " + name);
		parseResourceGroupScripts(name);
		createDeclaredResources(name);
	}
    //-----------------------------------------------------------------------
    void ResourceGroupManager::loadResourceGroup(const String& name)
    {
		LogManager::getSingleton().logMessage("Loading resource group " + name);
		// load all created resources
		ResourceGroup* grp = getResourceGroup(name);
		if (!grp)
		{
			Except(Exception::ERR_ITEM_NOT_FOUND, 
				"Cannot find a group named " + name, 
				"ResourceGroupManager::loadResourceGroup");
		}
		// Set current group
		mCurrentGroup = grp;

		// Count up resources for starting event
		ResourceGroup::LoadResourceOrderMap::iterator oi;
		size_t resourceCount = 0;
		for (oi = grp->loadResourceOrderMap.begin(); oi != grp->loadResourceOrderMap.end(); ++oi)
		{
			resourceCount += oi->second->size();
		}
		fireResourceGroupLoadStarted(name, resourceCount);

		// Now load for real
		for (oi = grp->loadResourceOrderMap.begin(); oi != grp->loadResourceOrderMap.end(); ++oi)
		{
			for (LoadUnloadResourceList::iterator l = oi->second->begin();
				l != oi->second->end(); ++oi)
			{
				(*l)->load();
				// fire event
				fireResourceLoad(*l);
			}
		}
		fireResourceGroupLoadEnded(name);

		// reset current group
		mCurrentGroup = 0;
		
		LogManager::getSingleton().logMessage("Finished loading resource group " + name);
    }
    //-----------------------------------------------------------------------
    void ResourceGroupManager::unloadResourceGroup(const String& name)
    {
		LogManager::getSingleton().logMessage("Unloading resource group " + name);
		ResourceGroup* grp = getResourceGroup(name);
		if (!grp)
		{
			Except(Exception::ERR_ITEM_NOT_FOUND, 
				"Cannot find a group named " + name, 
				"ResourceGroupManager::unloadResourceGroup");
		}
		// Set current group
		mCurrentGroup = grp;

		// Count up resources for starting event
		ResourceGroup::LoadResourceOrderMap::reverse_iterator oi;
		// unload in reverse order
		for (oi = grp->loadResourceOrderMap.rbegin(); oi != grp->loadResourceOrderMap.rend(); ++oi)
		{
			for (LoadUnloadResourceList::iterator l = oi->second->begin();
				l != oi->second->end(); ++oi)
			{
				(*l)->unload();
			}
		}

		// reset current group
		mCurrentGroup = 0;
		LogManager::getSingleton().logMessage("Finished unloading resource group " + name);
    }
	//-----------------------------------------------------------------------
	void ResourceGroupManager::clearResourceGroup(const String& name)
	{
		LogManager::getSingleton().logMessage("Clearing resource group " + name);
		ResourceGroup* grp = getResourceGroup(name);
		if (!grp)
		{
			Except(Exception::ERR_ITEM_NOT_FOUND, 
				"Cannot find a group named " + name, 
				"ResourceGroupManager::clearResourceGroup");
		}
		// set current group
		mCurrentGroup = grp;
		dropGroupContents(grp);
		// reset current group
		mCurrentGroup = 0;
		LogManager::getSingleton().logMessage("Finished clearing resource group " + name);
	}
    //-----------------------------------------------------------------------
    void ResourceGroupManager::destroyResourceGroup(const String& name)
    {
		LogManager::getSingleton().logMessage("Destroying resource group " + name);
		ResourceGroup* grp = getResourceGroup(name);
		if (!grp)
		{
			Except(Exception::ERR_ITEM_NOT_FOUND, 
				"Cannot find a group named " + name, 
				"ResourceGroupManager::destroyResourceGroup");
		}
		// set current group
		mCurrentGroup = grp;
        unloadResourceGroup(name); // will throw an exception if name not valid
		dropGroupContents(grp);
        mResourceGroupMap.erase(mResourceGroupMap.find(name));
		// reset current group
		mCurrentGroup = 0;
    }
    //-----------------------------------------------------------------------
    void ResourceGroupManager::addResourceLocation(const String& name, 
        const String& locType, const String& resGroup, bool recursive)
    {
        ResourceGroup* grp = getResourceGroup(resGroup);
        if (!grp)
        {
            Except(Exception::ERR_ITEM_NOT_FOUND, 
                "Cannot locate a resource group called '" + resGroup + "'", 
                "ResourceGroupManager::addResourceLocation");
        }

        // Get archive
        Archive* pArch = ArchiveManager::getSingleton().load( name, locType );
        // Add to location list
		ResourceLocation* loc = new ResourceLocation();
		loc->archive = pArch;
		loc->recursive = recursive;
        grp->locationList.push_back(loc);
        // Index resources
        StringVectorPtr vec = pArch->find("*", recursive);
        for( StringVector::iterator it = vec->begin(); it != vec->end(); ++it )
        {
			ResourceIndexEntry resIdx;
			resIdx.archive = pArch;
			resIdx.fullname = (*it);
			// Index under full name
            grp->resourceIndex[(*it)] = resIdx;
            // if recursive, index file under basename too
			if (recursive)
			{
				String baseName, path;
				StringUtil::splitFilename((*it), baseName, path);
				grp->resourceIndex[baseName] = resIdx;
			}
        }
		
		StringUtil::StrStreamType msg;
		msg << "Added resource location '" << name << "' of type '" << locType
			<< "' to resource group '" << resGroup;
		if (recursive)
			msg << " with recursive option";
		LogManager::getSingleton().logMessage(msg.str());
    }
    //-----------------------------------------------------------------------
    void ResourceGroupManager::removeResourceLocation(const String& name, 
        const String& resGroup)
    {
		ResourceGroup* grp = getResourceGroup(resGroup);
		if (!grp)
        {
            Except(Exception::ERR_ITEM_NOT_FOUND, 
                "Cannot locate a resource group called '" + resGroup + "'", 
                "ResourceGroupManager::addResourceLocation");
        }
        // Remove from location list
		LocationList::iterator li, liend;
		liend = grp->locationList.end();
		for (li = grp->locationList.begin(); li != liend; ++li)
		{
			Archive* pArch = (*li)->archive;
			if (pArch->getName() == name)
			{
				// Delete indexes
				ResourceLocationIndex::iterator rit, ritend;
				ritend = grp->resourceIndex.end();
				for (rit = grp->resourceIndex.begin(); rit != ritend;)
				{
					if (rit->second.archive == pArch)
					{
						ResourceLocationIndex::iterator del = rit++;
						grp->resourceIndex.erase(del);
					}
					else
					{
						++rit;
					}
				}
				// Erase list entry
				grp->locationList.erase(li);
				break;
			}

		}

		LogManager::getSingleton().logMessage("Removed resource location " + name);


    }
    //-----------------------------------------------------------------------
    void ResourceGroupManager::declareResource(const String& name, 
        const String& resourceType, const String& groupName,
		const NameValuePairList& loadParameters)
    {
		ResourceGroup* grp = getResourceGroup(groupName);
		if (!grp)
		{
			Except(Exception::ERR_ITEM_NOT_FOUND, 
				"Cannot find a group named " + groupName, 
				"ResourceGroupManager::declareResource");
		}
		
		ResourceDeclaration dcl;
		dcl.parameters = loadParameters;
		dcl.resourceName = name;
		dcl.resourceType = resourceType;
		grp->resourceDeclarations.push_back(dcl);
    }
    //-----------------------------------------------------------------------
    void ResourceGroupManager::undeclareResource(const String& name, 
		const String& groupName)
    {
		ResourceGroup* grp = getResourceGroup(groupName);
		if (!grp)
		{
			Except(Exception::ERR_ITEM_NOT_FOUND, 
				"Cannot find a group named " + groupName, 
				"ResourceGroupManager::undeclareResource");
		}

		for (ResourceDeclarationList::iterator i = grp->resourceDeclarations.begin();
			i != grp->resourceDeclarations.end(); ++i)
		{
			if (i->resourceName == name)
			{
				grp->resourceDeclarations.erase(i);
				break;
			}
		}
    }
    //-----------------------------------------------------------------------
    DataStreamPtr ResourceGroupManager::_findResource(
        const String& resourceName, const String& groupName)
    {
		// Try to find in resource index first
		ResourceGroup* grp = getResourceGroup(groupName);
		if (!grp)
		{
			Except(Exception::ERR_ITEM_NOT_FOUND, 
				"Cannot locate a resource group called '" + groupName + "'", 
				"ResourceGroupManager::_findResource");
		}

		Archive* pArch = 0;
		ResourceLocationIndex::iterator rit = grp->resourceIndex.find(resourceName);
		if (rit != grp->resourceIndex.end())
		{
			// Found in the index
			pArch = rit->second.archive;
			// look up under the fullname (this lets us load based on short name
			// if recursive was on)
			return pArch->open(rit->second.fullname);
		}
		else
		{
			// Search the hard way
			LocationList::iterator li, liend;
			liend = grp->locationList.end();
			for (li = grp->locationList.begin(); li != liend; ++li)
			{
				Archive* arch = (*li)->archive;
				DataStreamPtr ptr = arch->open(resourceName);
				if (!ptr.isNull())
				{
					return ptr;
				}
			}
		}

		
		// Not found
		Except(Exception::ERR_FILE_NOT_FOUND, "Cannot locate resource " + 
			resourceName + " in resource group " + groupName + ".", 
			"ResourceGroupManager::_findResource");

		// Keep compiler happy
		return DataStreamPtr();


    }
    //-----------------------------------------------------------------------
    DataStreamListPtr ResourceGroupManager::_findResources(
        const String& pattern, const String& groupName)
    {
		ResourceGroup* grp = getResourceGroup(groupName);
		if (!grp)
		{
			Except(Exception::ERR_ITEM_NOT_FOUND, 
				"Cannot locate a resource group called '" + groupName + "'", 
				"ResourceGroupManager::_findResources");
		}

		// Iterate through all the archives and build up a combined list of
		// streams
		DataStreamListPtr ret = DataStreamListPtr(new DataStreamList());

		LocationList::iterator li, liend;
		liend = grp->locationList.end();
		for (li = grp->locationList.begin(); li != liend; ++li)
		{
			Archive* arch = (*li)->archive;
			// Find all the names based on whether this archive is recursive
			StringVectorPtr names = arch->find(pattern, (*li)->recursive);

			// Iterate over the names and load a stream for each
			for (StringVector::iterator ni = names->begin(); ni != names->end(); ++ni)
			{
				DataStreamPtr ptr = arch->open(*ni);
				if (!ptr.isNull())
				{
					ret->push_back(ptr);
				}
			}
		}
		return ret;
		
    }
    //-----------------------------------------------------------------------
    void ResourceGroupManager::addResourceGroupListener(ResourceGroupListener* l)
    {
		mResourceGroupListenerList.push_back(l);
    }
    //-----------------------------------------------------------------------
    void ResourceGroupManager::removeResourceGroupListener(ResourceGroupListener* l)
    {
		for (ResourceGroupListenerList::iterator i = mResourceGroupListenerList.begin();
			i != mResourceGroupListenerList.end(); ++i)
		{
			if (*i == l)
			{
				mResourceGroupListenerList.erase(i);
				break;
			}
		}
    }
    //-----------------------------------------------------------------------
    void ResourceGroupManager::_registerResourceManager(
        const String& resourceType, ResourceManager* rm)
    {
		LogManager::getSingleton().logMessage(
			"Registering ResourceManager for type " + resourceType);
		mResourceManagerMap[resourceType] = rm;
		mResourceManagerOrderMap.insert(
			ResourceManagerOrderMap::value_type(rm->getLoadingOrder(), rm));
    }
    //-----------------------------------------------------------------------
    void ResourceGroupManager::_unregisterResourceManager(
        const String& resourceType)
    {
		LogManager::getSingleton().logMessage(
			"Unregistering ResourceManager for type " + resourceType);
		
		ResourceManagerMap::iterator i = mResourceManagerMap.find(resourceType);
		if (i != mResourceManagerMap.end())
		{
			mResourceManagerMap.erase(i);
			// Erase entry from order map too (deal with >1 manager with same order)
			Real order = i->second->getLoadingOrder();
			ResourceManagerOrderMap::iterator oi = mResourceManagerOrderMap.find(order);
			while (oi != mResourceManagerOrderMap.end() && oi->first == order)
			{
				if (oi->second == i->second)
				{
					// erase does not invalidate on multimap, except current
					ResourceManagerOrderMap::iterator del = oi++;
					mResourceManagerOrderMap.erase(del);
				}
				else
				{
					++oi;
				}
			}
		}
    }
	//-----------------------------------------------------------------------
	void ResourceGroupManager::parseResourceGroupScripts(const String& name)
	{
		LogManager::getSingleton().logMessage(
			"Parsing scripts for resource group " + name);

		ResourceGroup* grp = getResourceGroup(name);
		if (!grp)
		{
			Except(Exception::ERR_ITEM_NOT_FOUND, 
				"Cannot find a group named " + name, 
				"ResourceGroupManager::parseResourceGroupScripts");
		}
		// Set current group
		mCurrentGroup = grp;

		// Count up the number of scripts we have to parse
		std::list<DataStreamListPtr> streamListList;
		size_t scriptCount = 0;
		// Iterate over resource managers in loading order and get streams
		ResourceManagerOrderMap::iterator oi;
		for (oi = mResourceManagerOrderMap.begin();
			oi != mResourceManagerOrderMap.end(); ++oi)
		{
			ResourceManager* mgr = oi->second;
			if (mgr->isScriptingSupported())
			{
				// Get all the patterns and search them
				const StringVector& patterns = mgr->getScriptPatterns();
				for (StringVector::iterator p = patterns.begin(); p != patterns.end(); ++p)
				{
					DataStreamListPtr streamList = _findResources(*p, name);
					scriptCount += streamList->size();
					streamListList.push_back(streamList);
				}
			}
		}
		// Fire scripting event
		fireResourceGroupScriptingStarted(name, scriptCount);

		// Iterate over scripts and parse
		// Note we respect original ordering
		oi = mResourceManagerOrderMap.begin();
		for (std::list<DataStreamListPtr>::iterator i = streamListList.begin();
			i != streamListList.end(); ++i, ++oi)
		{
			ResourceManager* mgr = oi->second;
			// Iterate over each item in the list
			for (DataStreamList::iterator si = (*i)->begin(); si != (*i)->end(); ++si)
			{
				mgr->parseScript(*si, name);
				fireResourceScript((*si)->getName());
			}
		}

		// Reset current group
		mCurrentGroup = 0;
		fireResourceGroupScriptingEnded(name);
		LogManager::getSingleton().logMessage(
			"Finished parsing scripts for resource group " + name);
	}
	//-----------------------------------------------------------------------
	void ResourceGroupManager::createDeclaredResources(const String& name)
	{
		ResourceGroup* grp = getResourceGroup(name);
		if (!grp)
		{
			Except(Exception::ERR_ITEM_NOT_FOUND, 
				"Cannot find a group named " + name, 
				"ResourceGroupManager::createDeclaredResources");
		}
		// Set current group
		mCurrentGroup = grp;


		for (ResourceDeclarationList::iterator i = grp->resourceDeclarations.begin();
			i != grp->resourceDeclarations.end(); ++i)
		{
			ResourceDeclaration& dcl = *i;
			// Retrieve the appropriate manager
			ResourceManager* mgr = _getResourceManager(dcl.resourceType);
			// Create the resource
			ResourcePtr res = mgr->create(dcl.resourceName, name);
			// Set custom parameters
			res->setParameterList(dcl.parameters);
			// Add resource to load list
			ResourceGroup::LoadResourceOrderMap::iterator li = 
				grp->loadResourceOrderMap.find(mgr->getLoadingOrder());
			LoadUnloadResourceList* loadList;
			if (li == grp->loadResourceOrderMap.end())
			{
				loadList = new LoadUnloadResourceList();
				grp->loadResourceOrderMap[mgr->getLoadingOrder()] = loadList;
			}
			else
			{
				loadList = li->second;
			}
			loadList->push_back(res);

		}

		// Reset current group
		mCurrentGroup = 0;
	}
    //-----------------------------------------------------------------------
	void ResourceGroupManager::_notifyResourceCreated(ResourcePtr& res)
	{
		if (mCurrentGroup)
		{
			// Use current group (batch loading)
			addCreatedResource(res, *mCurrentGroup);
		}
		else
		{
			// Find group
			ResourceGroup* grp = getResourceGroup(res->getGroup());
			if (grp)
			{
				addCreatedResource(res, *grp);
			}
		}
	}
	//-----------------------------------------------------------------------
	void ResourceGroupManager::_notifyResourceRemoved(ResourcePtr& res)
	{
		if (mCurrentGroup)
		{
			// Do nothing - we're batch unloading so list will be cleared
		}
		else
		{
			// Find group
			ResourceGroup* grp = getResourceGroup(res->getGroup());
			if (grp)
			{
				ResourceGroup::LoadResourceOrderMap::iterator i = 
					grp->loadResourceOrderMap.find(
						res->getCreator()->getLoadingOrder());
				if (i != grp->loadResourceOrderMap.end())
				{
					// Iterate over the resource list and remove
					LoadUnloadResourceList* resList = i->second;
					for (LoadUnloadResourceList::iterator l = resList->begin();
						l != resList->end(); ++ l)
					{
						if ((*l).getPointer() == res.getPointer())
						{
							// this is the one
							resList->erase(l);
							break;
						}
					}
				}
			}
		}
	}
	//-----------------------------------------------------------------------
	void ResourceGroupManager::_notifyAllResourcesRemoved(ResourceManager* manager)
	{
		// Iterate over all groups
		for (ResourceGroupMap::iterator grpi = mResourceGroupMap.begin();
			grpi != mResourceGroupMap.end(); ++grpi)
		{
			// Iterate over all priorities
			for (ResourceGroup::LoadResourceOrderMap::iterator oi = grpi->second->loadResourceOrderMap.begin();
				oi != grpi->second->loadResourceOrderMap.end(); ++oi)
			{
				// Iterate over all resources
				for (LoadUnloadResourceList::iterator l = oi->second->begin();
					l != oi->second->end(); )
				{
					if ((*l)->getCreator() == manager)
					{
						// Increment first since iterator will be invalidated
						LoadUnloadResourceList::iterator del = l++;
						oi->second->erase(del);
					}
					else
					{
						++l;
					}
				}
			}

		}
	}
	//-----------------------------------------------------------------------
	void ResourceGroupManager::addCreatedResource(ResourcePtr& res, ResourceGroup& grp)
	{
		Real order = res->getCreator()->getLoadingOrder();

		ResourceGroup::LoadResourceOrderMap::iterator i = grp.loadResourceOrderMap.find(order);
		LoadUnloadResourceList* loadList;
		if (i == grp.loadResourceOrderMap.end())
		{
			loadList = new LoadUnloadResourceList();
			grp.loadResourceOrderMap[order] = loadList;
		}
		else
		{
			loadList = i->second;
		}
		loadList->push_back(res);
	}
	//-----------------------------------------------------------------------
	ResourceGroupManager::ResourceGroup* ResourceGroupManager::getResourceGroup(const String& name)
	{
		ResourceGroupMap::iterator i = mResourceGroupMap.find(name);
		if (i != mResourceGroupMap.end())
		{
			return i->second;
		}
		return 0;

	}
	//-----------------------------------------------------------------------
	void ResourceGroupManager::dropGroupContents(ResourceGroup* grp)
	{
		// delete all the load list entries
		ResourceGroup::LoadResourceOrderMap::iterator j, jend;
		jend = grp->loadResourceOrderMap.end();
		for (j = grp->loadResourceOrderMap.begin(); j != jend; ++j)
		{
			// Iterate over resources
			for (LoadUnloadResourceList::iterator k = j->second->begin();
				k != j->second->end(); ++k)
			{
				(*k)->getCreator()->remove((*k)->getHandle());
			}
			delete j->second;
		}
	}
	//-----------------------------------------------------------------------
	void ResourceGroupManager::deleteGroup(ResourceGroup* grp)
	{
		// delete all the load list entries
		ResourceGroup::LoadResourceOrderMap::iterator j, jend;
		jend = grp->loadResourceOrderMap.end();
		for (j = grp->loadResourceOrderMap.begin(); j != jend; ++j)
		{
			// Don't iterate over resources to drop with ResourceManager
			// Assume this is being done anyway since this is a shutdown method
			delete j->second;
		}
		// Drop location list
		for (LocationList::iterator ll = grp->locationList.begin();
			ll != grp->locationList.end(); ++ll)
		{
			delete *ll;
		}

		// delete ResourceGroup
		delete grp;
	}
	//-----------------------------------------------------------------------
	void ResourceGroupManager::fireResourceGroupScriptingStarted(const String& groupName, size_t scriptCount)
	{
		for (ResourceGroupListenerList::iterator l = mResourceGroupListenerList.begin();
			l != mResourceGroupListenerList.end(); ++l)
		{
			(*l)->resourceGroupScriptingStarted(groupName, scriptCount);
		}
	}
	//-----------------------------------------------------------------------
	void ResourceGroupManager::fireResourceScript(const String& scriptName)
	{
		for (ResourceGroupListenerList::iterator l = mResourceGroupListenerList.begin();
			l != mResourceGroupListenerList.end(); ++l)
		{
			(*l)->resourceScript(scriptName);
		}
	}
	//-----------------------------------------------------------------------
	void ResourceGroupManager::fireResourceGroupScriptingEnded(const String& groupName)
	{
		for (ResourceGroupListenerList::iterator l = mResourceGroupListenerList.begin();
			l != mResourceGroupListenerList.end(); ++l)
		{
			(*l)->resourceGroupScriptingEnded(groupName);
		}
	}
	//-----------------------------------------------------------------------
	void ResourceGroupManager::fireResourceGroupLoadStarted(const String& groupName, size_t resourceCount)
	{
		for (ResourceGroupListenerList::iterator l = mResourceGroupListenerList.begin();
			l != mResourceGroupListenerList.end(); ++l)
		{
			(*l)->resourceGroupLoadStarted(groupName, resourceCount);
		}
	}
	//-----------------------------------------------------------------------
	void ResourceGroupManager::fireResourceLoad(const ResourcePtr& resource)
	{
		for (ResourceGroupListenerList::iterator l = mResourceGroupListenerList.begin();
			l != mResourceGroupListenerList.end(); ++l)
		{
			(*l)->resourceLoad(resource);
		}
	}
	//-----------------------------------------------------------------------
	void ResourceGroupManager::fireResourceGroupLoadEnded(const String& groupName)
	{
		for (ResourceGroupListenerList::iterator l = mResourceGroupListenerList.begin();
			l != mResourceGroupListenerList.end(); ++l)
		{
			(*l)->resourceGroupLoadEnded(groupName);
		}
	}
	//-----------------------------------------------------------------------

}

Update of /cvsroot/ogre/ogrenew/OgreMain/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6305/OgreMain/src

Modified Files:
      Tag: resource-unstable
	OgreMeshSerializerImpl.cpp 
Log Message:
MeshSerializer fixes

Index: OgreMeshSerializerImpl.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/src/OgreMeshSerializerImpl.cpp,v
retrieving revision 1.20.4.3
retrieving revision 1.20.4.4
diff -C2 -d -r1.20.4.3 -r1.20.4.4
*** OgreMeshSerializerImpl.cpp	26 Nov 2004 21:29:37 -0000	1.20.4.3
--- OgreMeshSerializerImpl.cpp	30 Nov 2004 21:22:09 -0000	1.20.4.4
***************
*** 86,90 ****
  
          unsigned short streamID;
!         while(!stream.eof())
          {
              streamID = readChunk(stream);
--- 86,90 ----
  
          unsigned short streamID;
!         while(!stream->eof())
          {
              streamID = readChunk(stream);
***************
*** 477,484 ****
  
          // Find optional geometry streams
!         if (!stream.eof())
          {
              unsigned short streamID = readChunk(stream);
!             while(!stream.eof() && 
                  (streamID == M_GEOMETRY_VERTEX_DECLARATION || 
                   streamID == M_GEOMETRY_VERTEX_BUFFER ))
--- 477,484 ----
  
          // Find optional geometry streams
!         if (!stream->eof())
          {
              unsigned short streamID = readChunk(stream);
!             while(!stream->eof() && 
                  (streamID == M_GEOMETRY_VERTEX_DECLARATION || 
                   streamID == M_GEOMETRY_VERTEX_BUFFER ))
***************
*** 494,506 ****
                  }
                  // Get next stream
!                 if (!stream.eof())
                  {
                      streamID = readChunk(stream);
                  }
              }
!             if (!stream.eof())
              {
                  // Backpedal back to start of non-submesh stream
!                 stream.skip(-(long)stream_OVERHEAD_SIZE);
              }
          }
--- 494,506 ----
                  }
                  // Get next stream
!                 if (!stream->eof())
                  {
                      streamID = readChunk(stream);
                  }
              }
!             if (!stream->eof())
              {
                  // Backpedal back to start of non-submesh stream
!                 stream->skip(-(long)stream_OVERHEAD_SIZE);
              }
          }
***************
*** 511,518 ****
      {
          // Find optional geometry streams
!         if (!stream.eof())
          {
              unsigned short streamID = readChunk(stream);
!             while(!stream.eof() && 
                  (streamID == M_GEOMETRY_VERTEX_ELEMENT ))
              {
--- 511,518 ----
      {
          // Find optional geometry streams
!         if (!stream->eof())
          {
              unsigned short streamID = readChunk(stream);
!             while(!stream->eof() && 
                  (streamID == M_GEOMETRY_VERTEX_ELEMENT ))
              {
***************
*** 524,536 ****
                  }
                  // Get next stream
!                 if (!stream.eof())
                  {
                      streamID = readChunk(stream);
                  }
              }
!             if (!stream.eof())
              {
                  // Backpedal back to start of non-submesh stream
!                 stream.skip(-(long)stream_OVERHEAD_SIZE);
              }
          }
--- 524,536 ----
                  }
                  // Get next stream
!                 if (!stream->eof())
                  {
                      streamID = readChunk(stream);
                  }
              }
!             if (!stream->eof())
              {
                  // Backpedal back to start of non-submesh stream
!                 stream->skip(-(long)stream_OVERHEAD_SIZE);
              }
          }
***************
*** 593,597 ****
  			pMesh->mVertexBufferShadowBuffer);
          void* pBuf = vbuf->lock(HardwareBuffer::HBL_DISCARD);
!         stream.read(pBuf, dest->vertexCount * vertexSize);
  
  		// endian conversion for OSX
--- 593,597 ----
  			pMesh->mVertexBufferShadowBuffer);
          void* pBuf = vbuf->lock(HardwareBuffer::HBL_DISCARD);
!         stream->read(pBuf, dest->vertexCount * vertexSize);
  
  		// endian conversion for OSX
***************
*** 621,628 ****
  
          // Read in all the sub-streams. Each sub-stream should contain an index and Ogre::String for the name.
! 		if (!stream.eof())
  		{
  			streamID = readChunk(stream);
! 			while(!stream.eof() && (streamID == M_SUBMESH_NAME_TABLE_ELEMENT ))
  			{
  				// Read in the index of the submesh.
--- 621,628 ----
  
          // Read in all the sub-streams. Each sub-stream should contain an index and Ogre::String for the name.
! 		if (!stream->eof())
  		{
  			streamID = readChunk(stream);
! 			while(!stream->eof() && (streamID == M_SUBMESH_NAME_TABLE_ELEMENT ))
  			{
  				// Read in the index of the submesh.
***************
*** 632,642 ****
  
  				// If we're not end of file get the next stream ID
! 				if (!stream.eof())
  					streamID = readChunk(stream);
  			}
! 			if (!stream.eof())
  			{
  				// Backpedal back to start of stream
! 				stream.skip(-(long)stream_OVERHEAD_SIZE);
  			}
  		}
--- 632,642 ----
  
  				// If we're not end of file get the next stream ID
! 				if (!stream->eof())
  					streamID = readChunk(stream);
  			}
! 			if (!stream->eof())
  			{
  				// Backpedal back to start of stream
! 				stream->skip(-(long)stream_OVERHEAD_SIZE);
  			}
  		}
***************
*** 671,678 ****
  
          // Find all substreams 
!         if (!stream.eof())
          {
              streamID = readChunk(stream);
!             while(!stream.eof() &&
                  (streamID == M_GEOMETRY ||
  				 streamID == M_SUBMESH ||
--- 671,678 ----
  
          // Find all substreams 
!         if (!stream->eof())
          {
              streamID = readChunk(stream);
!             while(!stream->eof() &&
                  (streamID == M_GEOMETRY ||
  				 streamID == M_SUBMESH ||
***************
*** 699,703 ****
  							pMesh->sharedVertexData = 0;
  							// Skip this stream (pointer will have been returned to just after header)
! 							stream.skip(mCurrentstreamLen - stream_OVERHEAD_SIZE);
  						}
  						else
--- 699,703 ----
  							pMesh->sharedVertexData = 0;
  							// Skip this stream (pointer will have been returned to just after header)
! 							stream->skip(mCurrentstreamLen - stream_OVERHEAD_SIZE);
  						}
  						else
***************
*** 731,735 ****
                  }
  
!                 if (!stream.eof())
                  {
                      streamID = readChunk(stream);
--- 731,735 ----
                  }
  
!                 if (!stream->eof())
                  {
                      streamID = readChunk(stream);
***************
*** 737,744 ****
  
              }
!             if (!stream.eof())
              {
                  // Backpedal back to start of stream
!                 stream.skip(-(long)stream_OVERHEAD_SIZE);
              }
          }
--- 737,744 ----
  
              }
!             if (!stream->eof())
              {
                  // Backpedal back to start of stream
!                 stream->skip(-(long)stream_OVERHEAD_SIZE);
              }
          }
***************
*** 814,821 ****
  
          // Find all bone assignments (if present) 
!         if (!stream.eof())
          {
              streamID = readChunk(stream);
!             while(!stream.eof() &&
                  (streamID == M_SUBMESH_BONE_ASSIGNMENT ||
                   streamID == M_SUBMESH_OPERATION))
--- 814,821 ----
  
          // Find all bone assignments (if present) 
!         if (!stream->eof())
          {
              streamID = readChunk(stream);
!             while(!stream->eof() &&
                  (streamID == M_SUBMESH_BONE_ASSIGNMENT ||
                   streamID == M_SUBMESH_OPERATION))
***************
*** 831,835 ****
                  }
  
!                 if (!stream.eof())
                  {
                      streamID = readChunk(stream);
--- 831,835 ----
                  }
  
!                 if (!stream->eof())
                  {
                      streamID = readChunk(stream);
***************
*** 837,844 ****
  
              }
!             if (!stream.eof())
              {
                  // Backpedal back to start of stream
!                 stream.skip(-(long)stream_OVERHEAD_SIZE);
              }
          }
--- 837,844 ----
  
              }
!             if (!stream->eof())
              {
                  // Backpedal back to start of stream
!                 stream->skip(-(long)stream_OVERHEAD_SIZE);
              }
          }
***************
*** 864,868 ****
      }
      //---------------------------------------------------------------------
!     void MeshSerializerImpl::readSkeletonLink(DataStream &stream, Mesh* pMesh)
      {
          String skelName = readString(stream);
--- 864,868 ----
      }
      //---------------------------------------------------------------------
!     void MeshSerializerImpl::readSkeletonLink(DataStreamPtr& stream, Mesh* pMesh)
      {
          String skelName = readString(stream);
***************
*** 1222,1226 ****
  
  		usage.manualName = readString(stream);
! 		usage.manualMesh = NULL; // will trigger load later
  	}
      //---------------------------------------------------------------------
--- 1222,1226 ----
  
  		usage.manualName = readString(stream);
! 		usage.manualMesh.setNull(); // will trigger load later
  	}
      //---------------------------------------------------------------------
***************
*** 1229,1233 ****
  	{
  		usage.manualName = "";
! 		usage.manualMesh = 0;
  
  		// Get one set of detail per SubMesh
--- 1229,1233 ----
  	{
  		usage.manualName = "";
! 		usage.manualMesh.setNull();
  
  		// Get one set of detail per SubMesh
***************
*** 1519,1526 ****
          unsigned short streamID;
  
!         if (!stream.eof())
          {
              streamID = readChunk(stream);
!             while(!stream.eof() &&
                  streamID == M_EDGE_LIST_LOD)
              {
--- 1519,1526 ----
          unsigned short streamID;
  
!         if (!stream->eof())
          {
              streamID = readChunk(stream);
!             while(!stream->eof() &&
                  streamID == M_EDGE_LIST_LOD)
              {
***************
*** 1637,1641 ****
                  }
  
!                 if (!stream.eof())
                  {
                      streamID = readChunk(stream);
--- 1637,1641 ----
                  }
  
!                 if (!stream->eof())
                  {
                      streamID = readChunk(stream);
***************
*** 1643,1650 ****
  
              }
!             if (!stream.eof())
              {
                  // Backpedal back to start of stream
!                 stream.skip(-(long)stream_OVERHEAD_SIZE);
              }
          }
--- 1643,1650 ----
  
              }
!             if (!stream->eof())
              {
                  // Backpedal back to start of stream
!                 stream->skip(-(long)stream_OVERHEAD_SIZE);
              }
          }
***************
*** 1693,1700 ****
  
          // Find optional geometry streams
!         if (!stream.eof())
          {
              unsigned short streamID = readChunk(stream);
!             while(!stream.eof() && 
                  (streamID == M_GEOMETRY_NORMALS || 
                   streamID == M_GEOMETRY_COLOURS ||
--- 1693,1700 ----
  
          // Find optional geometry streams
!         if (!stream->eof())
          {
              unsigned short streamID = readChunk(stream);
!             while(!stream->eof() && 
                  (streamID == M_GEOMETRY_NORMALS || 
                   streamID == M_GEOMETRY_COLOURS ||
***************
*** 1714,1726 ****
                  }
                  // Get next stream
!                 if (!stream.eof())
                  {
                      streamID = readChunk(stream);
                  }
              }
!             if (!stream.eof())
              {
                  // Backpedal back to start of non-submesh stream
!                 stream.skip(-(long)stream_OVERHEAD_SIZE);
              }
          }
--- 1714,1726 ----
                  }
                  // Get next stream
!                 if (!stream->eof())
                  {
                      streamID = readChunk(stream);
                  }
              }
!             if (!stream->eof())
              {
                  // Backpedal back to start of non-submesh stream
!                 stream->skip(-(long)stream_OVERHEAD_SIZE);
              }
          }

Update of /cvsroot/ogre/ogrenew/OgreMain/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6305/OgreMain/include

Modified Files:
      Tag: resource-unstable
	OgreMesh.h OgreMeshSerializerImpl.h OgreSubMesh.h 
Log Message:
MeshSerializer fixes

Index: OgreMesh.h
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/include/OgreMesh.h,v
retrieving revision 1.46.4.5
retrieving revision 1.46.4.6
diff -C2 -d -r1.46.4.5 -r1.46.4.6
*** OgreMesh.h	26 Nov 2004 22:23:00 -0000	1.46.4.5
--- OgreMesh.h	30 Nov 2004 21:22:08 -0000	1.46.4.6
***************
*** 97,100 ****
--- 97,104 ----
      {
          friend class SubMesh;
+         friend class MeshSerializerImpl;
+         friend class MeshSerializerImpl_v1_2;
+         friend class MeshSerializerImpl_v1_1;
+ 
      public:
  		/** A way of recording the way each LODs is recorded this Mesh. */

Index: OgreMeshSerializerImpl.h
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/include/OgreMeshSerializerImpl.h,v
retrieving revision 1.8.4.3
retrieving revision 1.8.4.4
diff -C2 -d -r1.8.4.3 -r1.8.4.4
*** OgreMeshSerializerImpl.h	26 Nov 2004 21:29:36 -0000	1.8.4.3
--- OgreMeshSerializerImpl.h	30 Nov 2004 21:22:08 -0000	1.8.4.4
***************
*** 108,112 ****
          virtual void readGeometryVertexBuffer(DataStreamPtr& stream, Mesh* pMesh, VertexData* dest);
  
!         virtual void readSkeletonLink(DataStream &stream, Mesh* pMesh);
          virtual void readMeshBoneAssignment(DataStreamPtr& stream, Mesh* pMesh);
          virtual void readSubMeshBoneAssignment(DataStreamPtr& stream, Mesh* pMesh, 
--- 108,112 ----
          virtual void readGeometryVertexBuffer(DataStreamPtr& stream, Mesh* pMesh, VertexData* dest);
  
!         virtual void readSkeletonLink(DataStreamPtr& stream, Mesh* pMesh);
          virtual void readMeshBoneAssignment(DataStreamPtr& stream, Mesh* pMesh);
          virtual void readSubMeshBoneAssignment(DataStreamPtr& stream, Mesh* pMesh, 

Index: OgreSubMesh.h
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/include/OgreSubMesh.h,v
retrieving revision 1.17.8.1
retrieving revision 1.17.8.2
diff -C2 -d -r1.17.8.1 -r1.17.8.2
*** OgreSubMesh.h	25 Nov 2004 22:40:57 -0000	1.17.8.1
--- OgreSubMesh.h	30 Nov 2004 21:22:08 -0000	1.17.8.2
***************
*** 52,55 ****
--- 52,58 ----
      {
          friend class Mesh;
+         friend class MeshSerializerImpl;
+         friend class MeshSerializerImpl_v1_2;
+         friend class MeshSerializerImpl_v1_1;
      public:
          SubMesh();

Update of /cvsroot/ogre/ogrenew/OgreMain/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15570/OgreMain/src

Modified Files:
      Tag: resource-unstable
	OgreAnimation.cpp OgreBone.cpp 
	OgreBorderPanelOverlayElement.cpp OgreDynLibManager.cpp 
	OgreEntity.cpp OgreFont.cpp OgreFrustum.cpp 
	OgreGpuProgramUsage.cpp OgreILImageCodec.cpp OgreSkeleton.cpp 
	OgreSkeletonInstance.cpp OgreSubEntity.cpp OgreTagPoint.cpp 
Log Message:
Misc compile errors

Index: OgreAnimation.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/src/OgreAnimation.cpp,v
retrieving revision 1.14.4.1
retrieving revision 1.14.4.2
diff -C2 -d -r1.14.4.1 -r1.14.4.2
*** OgreAnimation.cpp	19 Nov 2004 22:46:30 -0000	1.14.4.1
--- OgreAnimation.cpp	30 Nov 2004 17:49:51 -0000	1.14.4.2
***************
*** 127,131 ****
      }
      //---------------------------------------------------------------------
!     void Animation::apply(SkeletonPtr& skel, Real timePos, Real weight, bool accumulate)
      {
          TrackList::iterator i;
--- 127,131 ----
      }
      //---------------------------------------------------------------------
!     void Animation::apply(Skeleton* skel, Real timePos, Real weight, bool accumulate)
      {
          TrackList::iterator i;

Index: OgreBone.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/src/OgreBone.cpp,v
retrieving revision 1.21.6.1
retrieving revision 1.21.6.2
diff -C2 -d -r1.21.6.1 -r1.21.6.2
*** OgreBone.cpp	19 Nov 2004 22:46:31 -0000	1.21.6.1
--- OgreBone.cpp	30 Nov 2004 17:49:51 -0000	1.21.6.2
***************
*** 32,41 ****
  
      //---------------------------------------------------------------------
!     Bone::Bone(unsigned short handle, SkeletonPtr& creator) 
          : Node(), mHandle(handle), mManuallyControlled(false), mCreator(creator)
      {
      }
      //---------------------------------------------------------------------
!     Bone::Bone(const String& name, unsigned short handle, SkeletonPtr& creator) 
          : Node(name), mHandle(handle), mManuallyControlled(false), mCreator(creator)
      {
--- 32,41 ----
  
      //---------------------------------------------------------------------
!     Bone::Bone(unsigned short handle, Skeleton* creator) 
          : Node(), mHandle(handle), mManuallyControlled(false), mCreator(creator)
      {
      }
      //---------------------------------------------------------------------
!     Bone::Bone(const String& name, unsigned short handle, Skeleton* creator) 
          : Node(name), mHandle(handle), mManuallyControlled(false), mCreator(creator)
      {

Index: OgreBorderPanelOverlayElement.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/src/OgreBorderPanelOverlayElement.cpp,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -d -r1.3.2.1 -r1.3.2.2
*** OgreBorderPanelOverlayElement.cpp	22 Nov 2004 22:41:59 -0000	1.3.2.1
--- OgreBorderPanelOverlayElement.cpp	30 Nov 2004 17:49:51 -0000	1.3.2.2
***************
*** 467,471 ****
          mBorderMaterialName = name;
          mpBorderMaterial = MaterialManager::getSingleton().getByName(name);
!         if (!mpBorderMaterial)
  			Except( Exception::ERR_ITEM_NOT_FOUND, "Could not find material " + name,
  				"BorderPanelOverlayElement::setBorderMaterialName" );
--- 467,471 ----
          mBorderMaterialName = name;
          mpBorderMaterial = MaterialManager::getSingleton().getByName(name);
!         if (mpBorderMaterial.isNull())
  			Except( Exception::ERR_ITEM_NOT_FOUND, "Could not find material " + name,
  				"BorderPanelOverlayElement::setBorderMaterialName" );

Index: OgreDynLibManager.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/src/OgreDynLibManager.cpp,v
retrieving revision 1.8.6.1
retrieving revision 1.8.6.2
diff -C2 -d -r1.8.6.1 -r1.8.6.2
*** OgreDynLibManager.cpp	13 Nov 2004 16:40:16 -0000	1.8.6.1
--- OgreDynLibManager.cpp	30 Nov 2004 17:49:51 -0000	1.8.6.2
***************
*** 47,51 ****
  	}
  	//-----------------------------------------------------------------------
!     DynLib* DynLibManager::load( const String& filename, int priority /* = 1 */ )
      {        
          DynLib* pLib = new DynLib(filename);
--- 47,51 ----
  	}
  	//-----------------------------------------------------------------------
!     DynLib* DynLibManager::load( const String& filename)
      {        
          DynLib* pLib = new DynLib(filename);

Index: OgreEntity.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/src/OgreEntity.cpp,v
retrieving revision 1.88.4.4
retrieving revision 1.88.4.5
diff -C2 -d -r1.88.4.4 -r1.88.4.5
*** OgreEntity.cpp	28 Nov 2004 22:57:25 -0000	1.88.4.4
--- OgreEntity.cpp	30 Nov 2004 17:49:51 -0000	1.88.4.5
***************
*** 70,76 ****
  
          // Is mesh skeletally animated?
!         if (mMesh->hasSkeleton() && mMesh->getSkeleton() != NULL)
          {
!             mSkeletonInstance = new SkeletonInstance(mMesh->getSkeleton());
              mSkeletonInstance->load();
          }
--- 70,76 ----
  
          // Is mesh skeletally animated?
!         if (mMesh->hasSkeleton() && !mMesh->getSkeleton().isNull())
          {
!             mSkeletonInstance = new SkeletonInstance(mMesh->getSkeleton().getPointer());
              mSkeletonInstance->load();
          }
***************
*** 1325,1329 ****
              */
  
!             mSkeletonInstance = new SkeletonInstance(mMesh->getSkeleton());
              mSkeletonInstance->load();
              mAnimationState = new AnimationStateSet();
--- 1325,1329 ----
              */
  
!             mSkeletonInstance = new SkeletonInstance(mMesh->getSkeleton().getPointer());
              mSkeletonInstance->load();
              mAnimationState = new AnimationStateSet();

Index: OgreFont.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/src/OgreFont.cpp,v
retrieving revision 1.25.4.1
retrieving revision 1.25.4.2
diff -C2 -d -r1.25.4.1 -r1.25.4.2
*** OgreFont.cpp	13 Nov 2004 16:40:16 -0000	1.25.4.1
--- OgreFont.cpp	30 Nov 2004 17:49:51 -0000	1.25.4.2
***************
*** 383,390 ****
          }
  
!         SDDataChunk imgchunk(imageData, tex_side * tex_side * 4);
  
          Image img; 
! 		img.loadRawData( imgchunk, tex_side, tex_side, PF_A8R8G8B8 );
  
  		TexturePtr texPtr = res;
--- 383,390 ----
          }
  
!         MemoryDataStream memStream(imageData, tex_side * tex_side * 4, true);
  
          Image img; 
! 		img.loadRawData( memStream, tex_side, tex_side, PF_A8R8G8B8 );
  
  		TexturePtr texPtr = res;

Index: OgreFrustum.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/src/OgreFrustum.cpp,v
retrieving revision 1.22.4.2
retrieving revision 1.22.4.3
diff -C2 -d -r1.22.4.2 -r1.22.4.3
*** OgreFrustum.cpp	25 Nov 2004 20:40:51 -0000	1.22.4.2
--- OgreFrustum.cpp	30 Nov 2004 17:49:51 -0000	1.22.4.3
***************
*** 70,74 ****
  
          // Initialise material
!         mMaterial = MaterialManager::getSingleton().getByName("BaseWhiteNoLighting"));
          
          // Alter superclass members
--- 70,74 ----
  
          // Initialise material
!         mMaterial = MaterialManager::getSingleton().getByName("BaseWhiteNoLighting");
          
          // Alter superclass members

Index: OgreGpuProgramUsage.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/src/OgreGpuProgramUsage.cpp,v
retrieving revision 1.5
retrieving revision 1.5.6.1
diff -C2 -d -r1.5 -r1.5.6.1
*** OgreGpuProgramUsage.cpp	9 May 2004 11:55:04 -0000	1.5
--- OgreGpuProgramUsage.cpp	30 Nov 2004 17:49:51 -0000	1.5.6.1
***************
*** 46,51 ****
  	void GpuProgramUsage::setProgramName(const String& name, bool resetParams)
  	{
! 		mProgram = static_cast<GpuProgram*>(
! 			GpuProgramManager::getSingleton().getByName(name));
  
          if (!mProgram)
--- 46,50 ----
  	void GpuProgramUsage::setProgramName(const String& name, bool resetParams)
  	{
! 		mProgram = GpuProgramManager::getSingleton().getByName(name);
  
          if (!mProgram)

Index: OgreILImageCodec.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/src/OgreILImageCodec.cpp,v
retrieving revision 1.7.4.1
retrieving revision 1.7.4.2
diff -C2 -d -r1.7.4.1 -r1.7.4.2
*** OgreILImageCodec.cpp	21 Nov 2004 23:03:51 -0000	1.7.4.1
--- OgreILImageCodec.cpp	30 Nov 2004 17:49:51 -0000	1.7.4.2
***************
*** 52,56 ****
      //---------------------------------------------------------------------
      void ILImageCodec::codeToFile(MemoryDataStreamPtr& input, 
!         const String& outFileName, Codec::CodecData* pData) const
      {
          OgreGuard( "ILImageCodec::codeToFile" );
--- 52,56 ----
      //---------------------------------------------------------------------
      void ILImageCodec::codeToFile(MemoryDataStreamPtr& input, 
!         const String& outFileName, Codec::CodecDataPtr& pData) const
      {
          OgreGuard( "ILImageCodec::codeToFile" );
***************
*** 61,65 ****
          ilBindImage( ImageName );
  
!         ImageData* pImgData = static_cast< ImageData * >( pData );
          std::pair< int, int > fmt_bpp = OgreFormat2ilFormat( pImgData->format );
          ilTexImage( 
--- 61,65 ----
          ilBindImage( ImageName );
  
!         ImageData* pImgData = static_cast< ImageData * >( pData.getPointer() );
          std::pair< int, int > fmt_bpp = OgreFormat2ilFormat( pImgData->format );
          ilTexImage( 

Index: OgreSkeleton.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/src/OgreSkeleton.cpp,v
retrieving revision 1.37.4.1
retrieving revision 1.37.4.2
diff -C2 -d -r1.37.4.1 -r1.37.4.2
*** OgreSkeleton.cpp	19 Nov 2004 22:46:31 -0000	1.37.4.1
--- OgreSkeleton.cpp	30 Nov 2004 17:49:51 -0000	1.37.4.2
***************
*** 41,44 ****
--- 41,50 ----
  
      //---------------------------------------------------------------------
+ 	Skeleton::Skeleton()
+ 		: Resource(),
+ 		mNextAutoHandle(0), mBlendState(ANIMBLEND_AVERAGE)
+ 	{
+ 	}
+ 	//---------------------------------------------------------------------
      Skeleton::Skeleton(ResourceManager* creator, const String& name, ResourceHandle handle,
          const String& group, bool isManual, ManualResourceLoader* loader) 

Index: OgreSkeletonInstance.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/src/OgreSkeletonInstance.cpp,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -C2 -d -r1.4.4.1 -r1.4.4.2
*** OgreSkeletonInstance.cpp	19 Nov 2004 22:46:31 -0000	1.4.4.1
--- OgreSkeletonInstance.cpp	30 Nov 2004 17:49:51 -0000	1.4.4.2
***************
*** 32,36 ****
      //-------------------------------------------------------------------------
      SkeletonInstance::SkeletonInstance(SkeletonPtr& masterCopy) 
!         : Skeleton(""), mSkeleton(masterCopy)
      {
          mNextTagPointAutoHandle = 0;
--- 32,36 ----
      //-------------------------------------------------------------------------
      SkeletonInstance::SkeletonInstance(SkeletonPtr& masterCopy) 
!         : Skeleton(), mSkeleton(masterCopy)
      {
          mNextTagPointAutoHandle = 0;

Index: OgreSubEntity.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/src/OgreSubEntity.cpp,v
retrieving revision 1.35.4.2
retrieving revision 1.35.4.3
diff -C2 -d -r1.35.4.2 -r1.35.4.3
*** OgreSubEntity.cpp	25 Nov 2004 20:40:51 -0000	1.35.4.2
--- OgreSubEntity.cpp	30 Nov 2004 17:49:51 -0000	1.35.4.3
***************
*** 100,104 ****
      }
      //-----------------------------------------------------------------------
!     const MaterialPtr SubEntity::getMaterial(void) const
      {
          return mpMaterial;
--- 100,104 ----
      }
      //-----------------------------------------------------------------------
!     const MaterialPtr& SubEntity::getMaterial(void) const
      {
          return mpMaterial;

Index: OgreTagPoint.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/src/OgreTagPoint.cpp,v
retrieving revision 1.11.4.1
retrieving revision 1.11.4.2
diff -C2 -d -r1.11.4.1 -r1.11.4.2
*** OgreTagPoint.cpp	19 Nov 2004 22:46:31 -0000	1.11.4.1
--- OgreTagPoint.cpp	30 Nov 2004 17:49:51 -0000	1.11.4.2
***************
*** 37,41 ****
  
      //-----------------------------------------------------------------------------
!     TagPoint::TagPoint(unsigned short handle, SkeletonPtr& creator): Bone(handle, creator)
      {
          mParentEntity = 0; 
--- 37,41 ----
  
      //-----------------------------------------------------------------------------
!     TagPoint::TagPoint(unsigned short handle, Skeleton* creator): Bone(handle, creator)
      {
          mParentEntity = 0;

Update of /cvsroot/ogre/ogrenew/OgreMain/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15570/OgreMain/include

Modified Files:
      Tag: resource-unstable
	OgreAnimation.h OgreBone.h OgreCodec.h OgreDynLib.h 
	OgreGpuProgramUsage.h OgreILImageCodec.h OgreSkeleton.h 
	OgreSkeletonInstance.h OgreTagPoint.h 
Log Message:
Misc compile errors

Index: OgreAnimation.h
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/include/OgreAnimation.h,v
retrieving revision 1.14.4.1
retrieving revision 1.14.4.2
diff -C2 -d -r1.14.4.1 -r1.14.4.2
*** OgreAnimation.h	19 Nov 2004 22:46:31 -0000	1.14.4.1
--- OgreAnimation.h	30 Nov 2004 17:49:51 -0000	1.14.4.2
***************
*** 128,132 ****
          other animations.
          */
!         void apply(SkeletonPtr& skeleton, Real timePos, Real weight = 1.0, bool accumulate = false);
  
          /** Tells the animation how to interpolate between keyframes.
--- 128,132 ----
          other animations.
          */
!         void apply(Skeleton* skeleton, Real timePos, Real weight = 1.0, bool accumulate = false);
  
          /** Tells the animation how to interpolate between keyframes.

Index: OgreBone.h
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/include/OgreBone.h,v
retrieving revision 1.15.6.1
retrieving revision 1.15.6.2
diff -C2 -d -r1.15.6.1 -r1.15.6.2
*** OgreBone.h	19 Nov 2004 22:46:31 -0000	1.15.6.1
--- OgreBone.h	30 Nov 2004 17:49:51 -0000	1.15.6.2
***************
*** 43,49 ****
      public:
          /** Constructor, not to be used directly (use Bone::createChild or Skeleton::createBone) */
!         Bone(unsigned short handle, SkeletonPtr& creator);
          /** Constructor, not to be used directly (use Bone::createChild or Skeleton::createBone) */
!         Bone(const String& name, unsigned short handle, SkeletonPtr& creator);
          ~Bone();
  
--- 43,49 ----
      public:
          /** Constructor, not to be used directly (use Bone::createChild or Skeleton::createBone) */
!         Bone(unsigned short handle, Skeleton* creator);
          /** Constructor, not to be used directly (use Bone::createChild or Skeleton::createBone) */
!         Bone(const String& name, unsigned short handle, Skeleton* creator);
          ~Bone();
  
***************
*** 112,117 ****
          Node* createChildImpl(const String& name);
  
!         /// Weak reference back to creator, for child creation (central memory allocation)
!         SkeletonPtr& mCreator;
  
          /// The inversed derived transform of the bone in the binding pose
--- 112,117 ----
          Node* createChildImpl(const String& name);
  
!         /// Pointer back to creator, for child creation (not smart ptr so child does not preserve parent)
!         Skeleton* mCreator;
  
          /// The inversed derived transform of the bone in the binding pose

Index: OgreCodec.h
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/include/OgreCodec.h,v
retrieving revision 1.12.4.1
retrieving revision 1.12.4.2
diff -C2 -d -r1.12.4.1 -r1.12.4.2
*** OgreCodec.h	21 Nov 2004 23:03:50 -0000	1.12.4.1
--- OgreCodec.h	30 Nov 2004 17:49:51 -0000	1.12.4.2
***************
*** 84,88 ****
              stream.
          */
!         virtual DataStreamPtr code(MemoryDataStreamPtr& input, CodecData* pData) const = 0;
          /** Codes the data in the input chunk and saves the result in the output
              filename provided. Provided for efficiency since coding to memory is
--- 84,88 ----
              stream.
          */
!         virtual DataStreamPtr code(MemoryDataStreamPtr& input, CodecDataPtr& pData) const = 0;
          /** Codes the data in the input chunk and saves the result in the output
              filename provided. Provided for efficiency since coding to memory is

Index: OgreDynLib.h
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/include/OgreDynLib.h,v
retrieving revision 1.8.8.1
retrieving revision 1.8.8.2
diff -C2 -d -r1.8.8.1 -r1.8.8.2
*** OgreDynLib.h	13 Nov 2004 16:40:16 -0000	1.8.8.1
--- OgreDynLib.h	30 Nov 2004 17:49:51 -0000	1.8.8.2
***************
*** 87,90 ****
--- 87,92 ----
          */
          virtual void unload();
+ 		/// Get the name of the library
+ 		const String& getName(void) const { return mName; }
  
          /**

Index: OgreGpuProgramUsage.h
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/include/OgreGpuProgramUsage.h,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -C2 -d -r1.6 -r1.6.6.1
*** OgreGpuProgramUsage.h	9 May 2004 11:55:03 -0000	1.6
--- OgreGpuProgramUsage.h	30 Nov 2004 17:49:51 -0000	1.6.6.1
***************
*** 65,69 ****
          GpuProgramType mType;
          // The program link
!         GpuProgram* mProgram;
  
          /// program parameters
--- 65,69 ----
          GpuProgramType mType;
          // The program link
!         GpuProgramPtr mProgram;
  
          /// program parameters

Index: OgreILImageCodec.h
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/include/OgreILImageCodec.h,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -C2 -d -r1.3.4.1 -r1.3.4.2
*** OgreILImageCodec.h	21 Nov 2004 23:03:51 -0000	1.3.4.1
--- OgreILImageCodec.h	30 Nov 2004 17:49:51 -0000	1.3.4.2
***************
*** 50,54 ****
          DataStreamPtr code(MemoryDataStreamPtr& input, CodecData* pData) const;
          /// @copydoc Codec::codeToFile
!         void codeToFile(MemoryDataStreamPtr& input, const String& outFileName, CodecData* pData) const;
          /// @copydoc Codec::decode
          DecodeResult decode(DataStreamPtr& input) const;
--- 50,54 ----
          DataStreamPtr code(MemoryDataStreamPtr& input, CodecData* pData) const;
          /// @copydoc Codec::codeToFile
!         void codeToFile(MemoryDataStreamPtr& input, const String& outFileName, CodecDataPtr& pData) const;
          /// @copydoc Codec::decode
          DecodeResult decode(DataStreamPtr& input) const;

Index: OgreSkeleton.h
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/include/OgreSkeleton.h,v
retrieving revision 1.17.6.1
retrieving revision 1.17.6.2
diff -C2 -d -r1.17.6.1 -r1.17.6.2
*** OgreSkeleton.h	19 Nov 2004 22:46:31 -0000	1.17.6.1
--- OgreSkeleton.h	30 Nov 2004 17:49:52 -0000	1.17.6.2
***************
*** 72,76 ****
      class _OgreExport Skeleton : public Resource
      {
!         friend class SkeletonInstance;
      public:
          /** Constructor, don't call directly, use SkeletonManager.
--- 72,80 ----
      class _OgreExport Skeleton : public Resource
      {
! 		friend class SkeletonInstance;
! 	protected:
! 		/// Internal constructor for use by SkeletonInstance only
! 		Skeleton();
! 
      public:
          /** Constructor, don't call directly, use SkeletonManager.

Index: OgreSkeletonInstance.h
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/include/OgreSkeletonInstance.h,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -C2 -d -r1.2.4.1 -r1.2.4.2
*** OgreSkeletonInstance.h	19 Nov 2004 22:46:31 -0000	1.2.4.1
--- OgreSkeletonInstance.h	30 Nov 2004 17:49:52 -0000	1.2.4.2
***************
*** 47,51 ****
          when you create an Entity based on a skeletally animated Mesh.
          */
!         SkeletonInstance(SkeletonPtr masterCopy);
          ~SkeletonInstance();
  
--- 47,51 ----
          when you create an Entity based on a skeletally animated Mesh.
          */
!         SkeletonInstance(SkeletonPtr& masterCopy);
          ~SkeletonInstance();
  

Index: OgreTagPoint.h
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/include/OgreTagPoint.h,v
retrieving revision 1.9.6.1
retrieving revision 1.9.6.2
diff -C2 -d -r1.9.6.1 -r1.9.6.2
*** OgreTagPoint.h	19 Nov 2004 22:46:31 -0000	1.9.6.1
--- OgreTagPoint.h	30 Nov 2004 17:49:52 -0000	1.9.6.2
***************
*** 53,57 ****
  
  	public:
! 		TagPoint(unsigned short handle, SkeletonPtr& creator);
  		virtual ~TagPoint();
  
--- 53,57 ----
  
  	public:
! 		TagPoint(unsigned short handle, Skeleton* creator);
  		virtual ~TagPoint();

Update of /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/macros
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12764/Tools/3dsmaxExport/scripts/ogre/macros

Modified Files:
	ogreToolbar.mcr 
Log Message:
fix a bug for IK export

Index: ogreToolbar.mcr
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/macros/ogreToolbar.mcr,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ogreToolbar.mcr	30 Nov 2004 11:29:17 -0000	1.14
--- ogreToolbar.mcr	30 Nov 2004 17:37:48 -0000	1.15
***************
*** 21,25 ****
  (
  	-- create a floater
! 	OgreExportFloater = newRolloutFloater "Ogre Exporter" 280 790 ;
  	
  	rollout OgreExportOptions "Options" width:270 height:140 rolledUp:true
--- 21,25 ----
  (
  	-- create a floater
! 	OgreExportFloater = newRolloutFloater "Ogre Exporter" 280 800 ;
  	
  	rollout OgreExportOptions "Options" width:270 height:140 rolledUp:true

Update of /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12764/Tools/3dsmaxExport/scripts/ogre/lib

Modified Files:
	OgreBipedLib.ms OgreSkeletonLib_meshfns.ms 
Log Message:
fix a bug for IK export

Index: OgreBipedLib.ms
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/lib/OgreBipedLib.ms,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** OgreBipedLib.ms	30 Nov 2004 11:29:15 -0000	1.5
--- OgreBipedLib.ms	30 Nov 2004 17:37:47 -0000	1.6
***************
*** 48,51 ****
--- 48,53 ----
  	else 
  	(
+ 		--print obj.name;
+ 		--print (classof obj.controller) ;
  		if (classof obj.controller == prs) then		-- standard controller
  		(
***************
*** 66,70 ****
  			)	
  		)
! 		else if (classof obj.controller == IK_ControllerMatrix3Controller) then		-- IK controller
  		(
  			local IKSR = IKsamplerate;
--- 68,72 ----
  			)	
  		)
! 		else if ((classof obj.controller == IK_ControllerMatrix3Controller) or (classof obj.controller == IKControl)) then		-- IK controller
  		(
  			local IKSR = IKsamplerate;

Index: OgreSkeletonLib_meshfns.ms
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/lib/OgreSkeletonLib_meshfns.ms,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** OgreSkeletonLib_meshfns.ms	30 Nov 2004 11:29:16 -0000	1.14
--- OgreSkeletonLib_meshfns.ms	30 Nov 2004 17:37:48 -0000	1.15
***************
*** 221,225 ****
  		matId = getFaceMatId tmesh face ;		
  		
- 		
  		-- Vertex Color Face
  		if (exportColours) then
--- 221,224 ----

Update of /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18141/Tools/3dsmaxExport/scripts/ogre/lib

Modified Files:
	OgreBipedLib.ms OgreSkeletonLib_meshfns.ms 
	OgreSkeletonLib_usefulfns.ms 
Log Message:
Speed up the mesh export process. No very easy to notice for small objects but great speed improvements for very big objects.
Any kind of objects can now be part of the hierarchy if they are part of the Skin/Physique modifier.

Index: OgreBipedLib.ms
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/lib/OgreBipedLib.ms,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OgreBipedLib.ms	29 Nov 2004 13:30:00 -0000	1.4
--- OgreBipedLib.ms	30 Nov 2004 11:29:15 -0000	1.5
***************
*** 2,25 ****
  
  -----------------------------------------------------------------------------
- -- check if the bone is the root object of the biped
- -----------------------------------------------------------------------------
- function isPelvis bipObj =
- (
- 	if (bipObj == undefined) then return false ;
- 	if (classof bipObj != Biped_Object) then return false;
- 	return ((biped.getNode bipObj 13) == bipObj) ;
- )
- 
- -----------------------------------------------------------------------------
- -- check if the bone is the footstep object of the biped
- -----------------------------------------------------------------------------
- function isFootStep bipObj =
- (
- 	if (bipObj == undefined) then return false ;
- 	if (classof bipObj != Biped_Object) then return false;
- 	return ((biped.getNode bipObj 16) == bipObj) ;
- )
- 
- -----------------------------------------------------------------------------
  -- gets  keyframes from the controllers animation
  -----------------------------------------------------------------------------
--- 2,5 ----
***************
*** 151,155 ****
  	at time 0f (
  		initTform = d.transform ;
! 		if (not isRootUniversal d) then (
  			mparent = d.parent.transform ;
  			initTform = initTform*inverse(mparent) ;
--- 131,135 ----
  	at time 0f (
  		initTform = d.transform ;
! 		if (not isRootUniversal2 d) then (
  			mparent = d.parent.transform ;
  			initTform = initTform*inverse(mparent) ;
***************
*** 174,178 ****
  			Tform = d.transform ;
  			-- if this is the pelvis
! 			if (isRootUniversal d) then (
  				mparent = matrix3 1 ;
  				-- if flipYZ == true
--- 154,158 ----
  			Tform = d.transform ;
  			-- if this is the pelvis
! 			if (isRootUniversal2 d) then (
  				mparent = matrix3 1 ;
  				-- if flipYZ == true
***************
*** 197,201 ****
  			
  			-- if this is the root bone and flipYZ == true
! 			if (isRootUniversal d and flipYZ) then (
  				Tform = flipYZTransform Tform ;
  			)
--- 177,181 ----
  			
  			-- if this is the root bone and flipYZ == true
! 			if (isRootUniversal2 d and flipYZ) then (
  				Tform = flipYZTransform Tform ;
  			)
***************
*** 237,240 ****
--- 217,221 ----
  -------------------------------------
  global BonesList=#()
+ global RootsList=#()
  
  -------------------------------------
***************
*** 245,260 ****
  -- recursive function to build the list of bones for the skeleton
  -----------------------------------------------------------------
! function computeBList b =
  (
  	bname = b ;
  	bone = execute ("$" + bname) ;
  	if (findItem BonesList bname == 0) then
! 		if (isKindOf bone BoneGeometry or iskindOf bone Biped_Object) then
  			append BonesList bname ;
  	childrenArray = bone.children ;
  	for i=1 to childrenArray.count do
  	(
!         if (isKindOf bone BoneGeometry or iskindOf bone Biped_Object) then
! 			computeBList (replaceSpaces childrenArray[i].name);
  	)
  )
--- 226,241 ----
  -- recursive function to build the list of bones for the skeleton
  -----------------------------------------------------------------
! function computeBList b sk phy exportHelpers =
  (
  	bname = b ;
  	bone = execute ("$" + bname) ;
  	if (findItem BonesList bname == 0) then
! 		if (isKindOf bone BoneGeometry or iskindOf bone Biped_Object or (exportHelpers and (isPartOfModifier bone sk phy)) ) then
  			append BonesList bname ;
  	childrenArray = bone.children ;
  	for i=1 to childrenArray.count do
  	(
!         if (isKindOf bone BoneGeometry or iskindOf bone Biped_Object or (exportHelpers and (isPartOfModifier bone sk phy))) then
! 			computeBList (replaceSpaces childrenArray[i].name) sk phy exportHelpers;
  	)
  )
***************
*** 291,295 ****
  -- find the root(s) of the rhierarchy
  -----------------------------------------------------------------
! function getHierarchyRoots phy sk =
  (
  	local rootstab=#();
--- 272,276 ----
  -- find the root(s) of the rhierarchy
  -----------------------------------------------------------------
! function getHierarchyRoots phy sk exportHelpers =
  (
  	local rootstab=#();
***************
*** 303,307 ****
  			d = execute ("$" + bname) ;
  		
! 			while (d.parent!=undefined and (iskindof d.parent BoneGeometry or iskindOf d.parent Biped_Object)) do
  			(
  				d = d.parent
--- 284,288 ----
  			d = execute ("$" + bname) ;
  		
! 			while (d.parent!=undefined and (iskindof d.parent BoneGeometry or iskindOf d.parent Biped_Object or (exportHelpers and (isPartOfModifier d.parent sk phy)) )) do
  			(
  				d = d.parent
***************
*** 319,323 ****
  			if trouve==0 then
  			(
! 				if (iskindof d BoneGeometry or iskindOf d Biped_Object) then
  				(
  					if (not g_MAX) then
--- 300,304 ----
  			if trouve==0 then
  			(
! 				if (iskindof d BoneGeometry or iskindOf d Biped_Object or (exportHelpers and (isPartOfModifier d sk phy)) ) then
  				(
  					if (not g_MAX) then
***************
*** 336,340 ****
  			d = execute ("$" + bname) ;
  		
! 			while (d.parent!=undefined and (iskindof d.parent BoneGeometry or iskindOf d.parent Biped_Object)) do
  			(
  				d = d.parent
--- 317,321 ----
  			d = execute ("$" + bname) ;
  		
! 			while (d.parent!=undefined and (iskindof d.parent BoneGeometry or iskindOf d.parent Biped_Object  or (exportHelpers and (isPartOfModifier d.parent sk phy)) )) do
  			(
  				d = d.parent
***************
*** 352,356 ****
  			if trouve==0 then
  			(
! 				if (iskindof d BoneGeometry or iskindOf d Biped_Object) then
  				(
  					if (not g_MAX) then
--- 333,337 ----
  			if trouve==0 then
  			(
! 				if (iskindof d BoneGeometry or iskindOf d Biped_Object or (exportHelpers and (isPartOfModifier d sk phy))) then
  				(
  					if (not g_MAX) then
***************
*** 368,383 ****
  -- function to build the list of bones for the skeleton
  -----------------------------------------------------------------
! function computeBonesList phy sk =
  (
! 	rootnodes = getHierarchyRoots phy sk ;	-- find the roots of the current hierarchy
! 	print rootsnode
! 	for b in rootnodes do
  	(
! 		computeBList b;
  	)
  	
  	-- add the nodes that are parts of the skin (or physique) modifier but are neither biped_object nor standard bones
  	-- only helpers (Point, Dummy) at the moment...
! 	addHelpersToHierarchy phy sk ;
  )
  
--- 349,364 ----
  -- function to build the list of bones for the skeleton
  -----------------------------------------------------------------
! function computeBonesList phy sk exportHelpers =
  (
! 	RootsList = getHierarchyRoots phy sk exportHelpers;	-- find the roots of the current hierarchy
! 	print RootsList;
! 	for b in RootsList do
  	(
! 		computeBList b sk phy exportHelpers;
  	)
  	
  	-- add the nodes that are parts of the skin (or physique) modifier but are neither biped_object nor standard bones
  	-- only helpers (Point, Dummy) at the moment...
! 	-- addHelpersToHierarchy phy sk ;
  )
  
***************
*** 397,401 ****
  	slidertime = 0f ;
  	Tform = d.transform ;
! 	if (not isRootUniversal d) then (
  		mparent = d.parent.transform ;
  		Tform = Tform*inverse(mparent) ;
--- 378,382 ----
  	slidertime = 0f ;
  	Tform = d.transform ;
! 	if (not isRootUniversal2 d) then (
  		mparent = d.parent.transform ;
  		Tform = Tform*inverse(mparent) ;
***************
*** 404,408 ****
  	Tform.pos = Tform.pos * scale ;
  		
! 	if ((isRootUniversal d) and flipYZ) then (
  		if (not g_MAX) then
  			format "- Flipping root... \n" ;
--- 385,389 ----
  	Tform.pos = Tform.pos * scale ;
  		
! 	if ((isRootUniversal2 d) and flipYZ) then (
  		if (not g_MAX) then
  			format "- Flipping root... \n" ;
***************
*** 430,439 ****
  -- write Bones (using writeB)
  -----------------------------
! function writeBones phy sk scale flipYZ outFile =
  (
  	local i ;
  	
  	if (BonesList.count == 0) then
! 		computeBonesList phy sk ;
  	
  	format("\t<bones>\n") to:outFile;
--- 411,422 ----
  -- write Bones (using writeB)
  -----------------------------
! function writeBones phy sk scale flipYZ exportHelpers outFile =
  (
  	local i ;
  	
+ 	OgreExportObject.exportProgress.value = 0;
+ 
  	if (BonesList.count == 0) then
! 		computeBonesList phy sk exportHelpers;
  	
  	format("\t<bones>\n") to:outFile;
***************
*** 443,450 ****
--- 426,437 ----
  	for i=1 to BonesList.count do
  	(
+ 		OgreExportObject.exportProgress.value = (100.0*i/BonesList.count);
+ 
  		writeB BonesList[i] i scale flipYZ outFile ;
  	)	
  	
  	format("\t</bones>\n") to:outFile;
+ 	
+ 	OgreExportObject.exportProgress.value = 100;
  )
  
***************
*** 454,458 ****
  function writeH b outFile =
  (
! 	if (not isRootUniversal b) then
  	(
  		p = b.parent ;
--- 441,445 ----
  function writeH b outFile =
  (
! 	if (not isRootUniversal2 b) then
  	(
  		p = b.parent ;
***************
*** 463,466 ****
--- 450,455 ----
  function writeHierarchy outFile =
  (
+ 	OgreExportObject.exportProgress.value = 0;
+ 
  	local bname,pelvis
  	format("\t<bonehierarchy>\n") to:outFile ;
***************
*** 468,471 ****
--- 457,462 ----
  	for i=1 to BonesList.count do
  	(
+ 		OgreExportObject.exportProgress.value = (100.0*i/BonesList.count);
+ 
  		b = execute ("$" + (replaceSpaces BonesList[i])) ;
  		writeH b outFile ;	
***************
*** 473,476 ****
--- 464,469 ----
  
  	format("\t</bonehierarchy>\n") to:outFile ;
+ 	
+ 	OgreExportObject.exportProgress.value = 100;
  )
  
***************
*** 482,485 ****
--- 475,480 ----
  	local i,n ;
  	
+ 	OgreExportObject.exportProgress.value = 0;
+ 	
  	format("\t<animations>\n") to: outFile ;
  	
***************
*** 491,495 ****
--- 486,494 ----
  		n = BonesList.count ;
  		for i = 1 to n do
+ 		(
+ 			OgreExportObject.exportProgress.value = (100.0*i/BonesList.count)/Anims.names.count;
+ 
  			writeTrack BonesList[i] i Anims.startframes[anm] Anims.endframes[anm] samplerate IKsamplerate Anims.lengths[anm] scale flipYZ outFile ;
+ 		)
  	
  		format("\t\t\t</tracks>\n") to:outFile					
***************
*** 498,501 ****
--- 497,502 ----
  	
  	format("\t</animations>\n") to: outFile ;
+ 
+ 	OgreExportObject.exportProgress.value = 100;
  )
  
***************
*** 552,556 ****
  		if (not g_MAX) then
  			format "Writing bones :\n" ;
! 		writeBones phy sk exportOptions.scale exportOptions.flipYZ outFile ;
  
  		if (not g_MAX) then
--- 553,557 ----
  		if (not g_MAX) then
  			format "Writing bones :\n" ;
! 		writeBones phy sk exportOptions.scale exportOptions.flipYZ exportOptions.exportHelpers outFile ;
  
  		if (not g_MAX) then

Index: OgreSkeletonLib_meshfns.ms
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/lib/OgreSkeletonLib_meshfns.ms,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** OgreSkeletonLib_meshfns.ms	29 Nov 2004 18:15:34 -0000	1.13
--- OgreSkeletonLib_meshfns.ms	30 Nov 2004 11:29:16 -0000	1.14
***************
*** 109,122 ****
  (
  	local start_uvs;
- 	local index = 0;
  	vertex = #();
  	--format "vertex a tester % % \n" vertexIndex vertexNormal;
! 	for vertex in searchTable do
  	(
- 		--format "vertex % % \n" vertex[1] vertex[2];
- 		index = index + 1;
- 		if (vertex[1]!=vertexIndex) then
- 			continue;
- 			
  		if (vertex[2]!=vertexNormal) then
  			continue;
--- 109,120 ----
  (
  	local start_uvs;
  	vertex = #();
  	--format "vertex a tester % % \n" vertexIndex vertexNormal;
! 
! 	if (searchTable[vertexIndex]==undefined) then
! 		return 0;
! 	
! 	for vertex in searchTable[vertexIndex] do
  	(
  		if (vertex[2]!=vertexNormal) then
  			continue;
***************
*** 149,153 ****
  		)
  		
! 		return index ;
  	)
  	return 0;
--- 147,151 ----
  		)
  		
! 		return vertex[1] ;
  	)
  	return 0;
***************
*** 167,171 ****
  -- stores datas in verticesArrays and facesArrays.
  ----------------------------------------------------------------------------
! function getDatas tmesh flipyz scale flipNormal exportUV numUVsets exportColours sk phy =
  (
  	local face;						--index of the current face
--- 165,169 ----
  -- stores datas in verticesArrays and facesArrays.
  ----------------------------------------------------------------------------
! function getDatas tmesh flipyz scale flipNormal exportUV numUVsets exportColours exportHelpers sk phy =
  (
  	local face;						--index of the current face
***************
*** 211,215 ****
  	-- compute bones list for the model.
  	BonesList=#()
! 	computeBonesList phy sk;
  
  	numFaces = (getNumFaces tmesh);
--- 209,213 ----
  	-- compute bones list for the model.
  	BonesList=#()
! 	computeBonesList phy sk exportHelpers ;
  
  	numFaces = (getNumFaces tmesh);
***************
*** 218,222 ****
  	for face = 1 to numFaces do 		-- LOOP on FACES --
  	(		
! 		--progressUpdate (100.0*face/numFaces) ;
  	
  		faceVerticesIndices = getFace tmesh face ;
--- 216,220 ----
  	for face = 1 to numFaces do 		-- LOOP on FACES --
  	(		
! 		OgreExportObject.exportProgress.value = (100.0*face/numFaces);
  	
  		faceVerticesIndices = getFace tmesh face ;
***************
*** 283,298 ****
  			if (newVertex == 1) then -- That is to say it has not been found. 
  			(
  				-- the vertex number for the current submesh must be updated
! 				-- vertex number is increased.								
! 				ogreVertNum = searchTable.count + 1 ;
  				
! 				-- it is added to the search table.
! 				searchTable[ogreVertNum] = #() ;
! 				append searchTable[ogreVertNum] vertexIndex ;
! 				n = copy vertexNormal;
! 				append searchTable[ogreVertNum] n ;
  				if (exportColours) then
  				(
! 					append searchTable[ogreVertNum] VertexColorIndex ;
  				)
  				if (exportUV) then
--- 281,309 ----
  			if (newVertex == 1) then -- That is to say it has not been found. 
  			(
+ 				-- Maybe the material found defines a new submesh...
+ 				if (verticesArrays[matId] == undefined) then
+ 				(
+ 					format "- Submesh detected: material ID = %\n" matId
+ 					verticesArrays[matId] = #() ;
+ 					boneAssignments[matId] = #() ;
+ 					append submeshesId matId ;
+ 				)
+ 
  				-- the vertex number for the current submesh must be updated
! 				-- vertex number is increased
! 				ogreVertNum = verticesArrays[matId].count + 1; 
  				
! 				-- it is added to the searchTable
! 				if (searchTable[vertexIndex]==undefined) then
! 				(
! 					searchTable[vertexIndex] = #() ;
! 				)
! 				local data = #();
! 				append data ogreVertNum ;
! 				n = copy vertexNormal ;
! 				append data n ;
  				if (exportColours) then
  				(
! 					append data VertexColorIndex ;
  				)
  				if (exportUV) then
***************
*** 301,308 ****
  					(
  						for uv=1 to UVcoords.count do
! 							append searchTable[ogreVertNum] UVcoords[uv];
  					)
  				)
! 				--print searchTable[ogreVertNum];
  					
  				-- we retrieve data
--- 312,319 ----
  					(
  						for uv=1 to UVcoords.count do
! 							append data UVcoords[uv];
  					)
  				)
! 				append searchTable[vertexIndex] data ;
  					
  				-- we retrieve data
***************
*** 328,339 ****
  				)
  				
! 				-- Maybe the material found defines a new submesh...
! 				if (verticesArrays[matId] == undefined) then
! 				(
! 					format "- Submesh detected: material ID = %\n" matId
! 					verticesArrays[matId] = #() ;
! 					boneAssignments[matId] = #() ;
! 					append submeshesId matId ;
! 				)
  				vertexData = #(vertexPosition[1],vertexPosition[2],vertexPosition[3],vertexNormal[1],vertexNormal[2],vertexNormal[3],vertexColor.r,vertexColor.g,vertexColor.b,vertexColor.a) ;
  				if (exportUV) then
--- 339,343 ----
  				)
  				
! 				-- store the vertex in verticesArrays
  				vertexData = #(vertexPosition[1],vertexPosition[2],vertexPosition[3],vertexNormal[1],vertexNormal[2],vertexNormal[3],vertexColor.r,vertexColor.g,vertexColor.b,vertexColor.a) ;
  				if (exportUV) then
***************
*** 396,400 ****
  					(
  						-- gets the root Id:
! 						append boneAssignments[matId] #(ogreVertNum,0,1) ;
  					)
  				)				
--- 400,404 ----
  					(
  						-- gets the root Id:
! 						append boneAssignments[matId] #(ogreVertNum-1,0,1) ;
  					)
  				)				
***************
*** 611,615 ****
  		sk = getSkin pmesh;
  		
- 		
  		if (sk != undefined) then
  			format "Skin modifier detected.\n"
--- 615,618 ----
***************
*** 632,639 ****
  			max modify mode ;
  			modPanel.setCurrentObject pmesh.modifiers[#Physique] ;
- 			--setBonesNumber phy ;
  			--physiqueOps.setInitialPose pmesh true ;
  		)
! 		
  		-- retieving material
  		if (pmesh.material != undefined) then (
--- 635,643 ----
  			max modify mode ;
  			modPanel.setCurrentObject pmesh.modifiers[#Physique] ;
  			--physiqueOps.setInitialPose pmesh true ;
  		)
! 
! 		OgreExportObject.exportProgress.value = 0;
! 	
  		-- retieving material
  		if (pmesh.material != undefined) then (
***************
*** 648,652 ****
  		format "Retrieving vertices and faces data : \n" ;
  	
! 		getDatas m exportOptions.flipyz exportOptions.scale exportOptions.flipNormal exportOptions.exportUV exportOptions.UVchannels exportOptions.exportColours sk phy;
  		
  		-- writing in the file
--- 652,656 ----
  		format "Retrieving vertices and faces data : \n" ;
  	
! 		getDatas m exportOptions.flipyz exportOptions.scale exportOptions.flipNormal exportOptions.exportUV exportOptions.UVchannels exportOptions.exportColours exportOptions.exportHelpers sk phy;
  		
  		-- writing in the file
***************
*** 668,671 ****
--- 672,676 ----
  		MessageBox ("Exporting mesh successful !") ;
  		
+ 		OgreExportObject.exportProgress.value = 100;
  	)
  	return true ;

Index: OgreSkeletonLib_usefulfns.ms
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/lib/OgreSkeletonLib_usefulfns.ms,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** OgreSkeletonLib_usefulfns.ms	28 Nov 2004 22:06:05 -0000	1.7
--- OgreSkeletonLib_usefulfns.ms	30 Nov 2004 11:29:16 -0000	1.8
***************
*** 8,12 ****
  
  -- global structures
! struct exportOptions (sampleRate, ikSampleRate, scale, flipyz, flipNormal, exportColours, exportUV, UVchannels);
  struct exportAnims (names, startframes, endframes, lengths) ;
  
--- 8,12 ----
  
  -- global structures
! struct exportOptions (sampleRate, ikSampleRate, scale, flipyz, flipNormal, exportColours, exportUV, UVchannels, exportHelpers);
  struct exportAnims (names, startframes, endframes, lengths) ;
  
***************
*** 14,17 ****
--- 14,20 ----
  global Options;
  
+ global OgreExportFloater;
+ global OgreExportOptions, OgreExportObject, OgreExportMesh, OgreExportAnimation, OgreExportMaterial, OgreExportAbout;
+ 
  --------------------------------------------------------------------
  -- compute the transform, if you want to flip Y and Z axis,
***************
*** 35,38 ****
--- 38,62 ----
  )
  
+ -----------------------------------------------------------------------------
+ -- check if the bone is the root object of the biped
+ -----------------------------------------------------------------------------
+ function isPelvis bipObj =
+ (
+ 	if (bipObj == undefined) then return false ;
+ 	if (classof bipObj != Biped_Object) then return false;
+ 	return ((biped.getNode bipObj 13) == bipObj) ;
+ )
+ 
+ 
+ -----------------------------------------------------------------------------
+ -- check if the bone is the footstep object of the biped
+ -----------------------------------------------------------------------------
+ function isFootStep bipObj =
+ (
+ 	if (bipObj == undefined) then return false ;
+ 	if (classof bipObj != Biped_Object) then return false;
+ 	return ((biped.getNode bipObj 16) == bipObj) ;
+ )
+ 
  
  --------------------------------------------------------------------
***************
*** 62,65 ****
--- 86,130 ----
  
  --------------------------------------------------------------------
+ -- returns if the object is a root or not,
+ -- handles any kind oj object
+ --------------------------------------------------------------------
+ function isRootUniversal2 b = (
+ 	bname = replaceSpaces b.name;
+ 	ind = (findItem RootsList bname);
+ 	if (ind == 0) then
+ 		return false;
+ 	else
+ 		return true;
+ )
+ 
+ --------------------------------------------------------------------
+ -- returns if the object is part of the skin (or physique modifier)
+ --------------------------------------------------------------------
+ function isPartOfModifier b sk phy = (
+ 	name = replaceSpaces b.name ;
+ 	if (sk!=undefined) then
+ 	(
+ 		for i=1 to (skinOps.GetNumberBones sk) do
+ 		(
+ 			bname = skinOps.GetBoneName sk i 1 ;
+ 			replaceSpaces bname ;
+ 			if (name == bname) then
+ 				return true;
+ 		)
+ 	)
+ 	else if (phy!=undefined) then
+ 	(
+ 		for i=1 to (physiqueOps.GetBoneCount $) do
+ 		(
+ 			bname = (physiqueOps.GetBones $)[i].name;
+ 			replaceSpaces bname ;
+ 			if (name == bname) then
+ 				return true;
+ 		)
+ 	)
+ 	return false;
+ )
+ 
+ --------------------------------------------------------------------
  -- creates a new array (which must be set up as an array before
  -- calling this function) in which there isn't the same element.

Update of /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/macros
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18141/Tools/3dsmaxExport/scripts/ogre/macros

Modified Files:
	ogreToolbar.mcr 
Log Message:
Speed up the mesh export process. No very easy to notice for small objects but great speed improvements for very big objects.
Any kind of objects can now be part of the hierarchy if they are part of the Skin/Physique modifier.

Index: ogreToolbar.mcr
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/macros/ogreToolbar.mcr,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ogreToolbar.mcr	29 Nov 2004 17:50:23 -0000	1.13
--- ogreToolbar.mcr	30 Nov 2004 11:29:17 -0000	1.14
***************
*** 20,25 ****
  	Icon:#("Maintoolbar",49)
  (
- 	local OgreExportOptions, OgreExportObject, OgreExportMesh, OgreExportAnimation, OgreExportMaterial, OgreExportAbout;
- 	
  	-- create a floater
  	OgreExportFloater = newRolloutFloater "Ogre Exporter" 280 790 ;
--- 20,23 ----
***************
*** 109,112 ****
--- 107,112 ----
  		button chooseFilename "Browse" pos:[170,164] width:82 height:20 toolTip:"chooose the name of your output files"
  		button export "Export !" pos:[29,191] width:214 height:40 toolTip:"export your mesh, skeleton ......"
+ 		progressBar exportProgress pos:[9,235] width:250 height:10
+ 		
  		on OgreExportObject open  do
  		(
***************
*** 205,208 ****
--- 205,209 ----
  					Options.UVchannels = OgreExportMesh.SPchannels.value;	
  				)
+ 				Options.exportHelpers = (OgreExportAnimation.CBexporthelpers.enabled and OgreExportAnimation.CBexporthelpers.checked);
  				
  				if (not g_MAX) then
***************
*** 226,230 ****
  					Options.sampleRate = OgreExportAnimation.SPsamplerate.value ;
  					Options.ikSampleRate = OgreExportAnimation.SPiksamplerate.value ;
! 
  					exportingSkelDone =	writeSkeleton m Options Anims editFilename.text ;
  				)
--- 227,231 ----
  					Options.sampleRate = OgreExportAnimation.SPsamplerate.value ;
  					Options.ikSampleRate = OgreExportAnimation.SPiksamplerate.value ;
! 				
  					exportingSkelDone =	writeSkeleton m Options Anims editFilename.text ;
  				)
***************
*** 386,405 ****
  	(
  		checkbox CBexportSkeleton "Export Skeleton" pos:[5,4] width:150 height:19 enabled:false
! 		groupBox grp3 "Export settings" pos:[4,26] width:262 height:56
  		--checkbox CBbiped "Biped Export" pos:[13,44] width:246 height:19 enabled:false
! 		spinner SPsamplerate "Sample Rate" pos:[21,45] width:186 height:16 enabled:false range:[0.0,10000,0.0] type:#float scale:0.5 
! 		spinner SPiksamplerate "IK Sample Rate" pos:[27,63] width:180 height:16 enabled:false range:[0.0,10000,5.0] type:#float scale:0.5 
! 		groupBox grp4 "Animation settings" pos:[4,86] width:261 height:252
! 		button getFromModifier "<-" pos:[14,104] width:61 height:21 enabled:false toolTip:"retrieve information from OctopusExport Modifier"
! 		label lbl4 "Get settings from Octopus modifier" pos:[86,108] width:167 height:14 enabled:true
! 		groupBox grp5 "Animations" pos:[8,129] width:253 height:203
! 		button addAnimation "Add" pos:[16,144] width:80 height:22 enabled:false toolTip:"add an animation to the list"
! 		button deleteAnimation "Delete" pos:[172,145] width:80 height:22 enabled:false toolTip:"remove an animation from the list"
! 		comboBox ListAnimations "" pos:[17,171] width:235 height:6 enabled:false
! 		label lbl5 "Frames" pos:[17,270] width:236 height:16
! 		spinner SPframestart "from" pos:[25,287] width:106 height:16 enabled:false range:[0,10000,0] type:#integer scale:1
! 		spinner SPframeend "to" pos:[154,287] width:96 height:16 enabled:false range:[0,10000,100] type:#integer scale:1
! 		label lbl6 "Length (in seconds)" pos:[18,310] width:115 height:16
! 		spinner SPanimlength "" pos:[120,309] width:130 height:16 range:[0,10000,10] type:#float scale:0.1
  		on OgreExportAnimation open  do
  		(
--- 387,407 ----
  	(
  		checkbox CBexportSkeleton "Export Skeleton" pos:[5,4] width:150 height:19 enabled:false
! 		groupBox grp3 "Export settings" pos:[4,26] width:262 height:76
  		--checkbox CBbiped "Biped Export" pos:[13,44] width:246 height:19 enabled:false
! 		spinner SPsamplerate "Sample Rate" pos:[11,45] width:186 height:16 enabled:false range:[0.0,10000,0.0] type:#float scale:0.5 
! 		spinner SPiksamplerate "IK Sample Rate" pos:[17,63] width:180 height:16 enabled:false range:[0.0,10000,5.0] type:#float scale:0.5 
! 		checkbox CBexporthelpers "Export non-bones objects (must be in the modifier)" pos:[11,81] width:254 height:16 enabled:false checked:false
! 		groupBox grp4 "Animation settings" pos:[4,106] width:261 height:252
! 		button getFromModifier "<-" pos:[14,124] width:61 height:21 enabled:false toolTip:"retrieve information from OctopusExport Modifier"
! 		label lbl4 "Get settings from Octopus modifier" pos:[86,128] width:167 height:14 enabled:true
! 		groupBox grp5 "Animations" pos:[8,149] width:253 height:203
! 		button addAnimation "Add" pos:[16,164] width:80 height:22 enabled:false toolTip:"add an animation to the list"
! 		button deleteAnimation "Delete" pos:[172,165] width:80 height:22 enabled:false toolTip:"remove an animation from the list"
! 		comboBox ListAnimations "" pos:[17,191] width:235 height:6 enabled:false
! 		label lbl5 "Frames" pos:[17,290] width:236 height:16
! 		spinner SPframestart "from" pos:[25,307] width:106 height:16 enabled:false range:[0,10000,0] type:#integer scale:1
! 		spinner SPframeend "to" pos:[154,307] width:96 height:16 enabled:false range:[0,10000,100] type:#integer scale:1
! 		label lbl6 "Length (in seconds)" pos:[18,330] width:115 height:16
! 		spinner SPanimlength "" pos:[120,329] width:130 height:16 range:[0,10000,10] type:#float scale:0.1
  		on OgreExportAnimation open  do
  		(
***************
*** 410,413 ****
--- 412,416 ----
  			OgreExportAnimation.SPsamplerate.enabled = false;
  			OgreExportAnimation.SPiksamplerate.enabled = false;
+ 			OgreExportAnimation.CBexporthelpers.enabled = false;
  			OgreExportAnimation.addAnimation.enabled = false;
  			OgreExportAnimation.deleteAnimation.enabled = false;
***************
*** 428,431 ****
--- 431,435 ----
  					OgreExportAnimation.SPsamplerate.enabled = true;
  					OgreExportAnimation.SPiksamplerate.enabled = true;
+ 					OgreExportAnimation.CBexporthelpers.enabled = true;
  					OgreExportAnimation.addAnimation.enabled = true;
  					OgreExportAnimation.deleteAnimation.enabled = true;
***************
*** 452,455 ****
--- 456,460 ----
  				OgreExportAnimation.SPsamplerate.enabled = state;
  				OgreExportAnimation.SPiksamplerate.enabled = state;
+ 				OgreExportAnimation.CBexporthelpers.enabled = state;
  				OgreExportAnimation.addAnimation.enabled = state;
  				OgreExportAnimation.deleteAnimation.enabled = state;

Update of /cvsroot/ogre/ogrenew/Tools/BlenderExport
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10092

Modified Files:
	ogreexport.py 
Log Message:
Allow image textures to be assigned via a material texture channel.

Index: ogreexport.py
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Tools/BlenderExport/ogreexport.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ogreexport.py	29 Nov 2004 23:39:30 -0000	1.21
--- ogreexport.py	30 Nov 2004 00:21:10 -0000	1.22
***************
*** 2005,2013 ****
  				# face is visible
  				hasTexture = 0
  				if ((uvToggle.val) and (data.hasFaceUV()) and (face.mode & Blender.NMesh.FaceModes["TEX"])):
  					if face.image:
  						hasTexture = 1
  					else:
! 						exportLogger.logError("Face is textured but has no image assigned!")
  				if ((nMaterials > 0 ) or (hasTexture == 1)):
  					# create material of the face:
--- 2005,2027 ----
  				# face is visible
  				hasTexture = 0
+ 				# texture image name
+ 				textureFile = None
  				if ((uvToggle.val) and (data.hasFaceUV()) and (face.mode & Blender.NMesh.FaceModes["TEX"])):
  					if face.image:
+ 						textureFile = face.image.filename
  						hasTexture = 1
  					else:
! 						# check if image texture is assigend as material texture
! 						if (nMaterials > 0):
! 							for materialTexture in data.materials[face.materialIndex].getTextures():
! 								if ((materialTexture is not None) \
! 									and (materialTexture.mapto & Blender.Texture.MapTo['COL']) \
! 									and (materialTexture.texco & Blender.Texture.TexCo['UV']) \
! 									and (materialTexture.tex.type == Blender.Texture.Types.IMAGE)):
! 										# use image as material.texture
! 										textureFile = materialTexture.tex.image.filename
! 										hasTexture = 1
! 						if not hasTexture:
! 							exportLogger.logError("Face is textured but has no image assigned!")
  				if ((nMaterials > 0 ) or (hasTexture == 1)):
  					# create material of the face:
***************
*** 2031,2038 ****
  					else:
  						materialName += "SOLID/"
- 					# texture image name
- 					textureFile = None
  					if hasTexture:
- 						textureFile = face.image.filename
  						materialName += os.path.basename(textureFile)
  					# insert into Dicts
--- 2045,2049 ----

Update of /cvsroot/ogre/ogrenew/Tools/BlenderExport
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31364

Modified Files:
	ogreexport.py 
Log Message:
Preliminary bump map support.

Index: ogreexport.py
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Tools/BlenderExport/ogreexport.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ogreexport.py	28 Nov 2004 17:33:12 -0000	1.20
--- ogreexport.py	29 Nov 2004 23:39:30 -0000	1.21
***************
*** 123,126 ****
--- 123,127 ----
  #          - use Blender.World.GetCurrent() for Blender > 2.34
  #          - fixed calculation of initial bone rotation
+ #          - preliminary bump map support
  #   0.15.1: * Sun Nov 27 2004 John Bartholomew <johnb213@...>
  #          - option to run OgreXMLConverter automatically on the exported files
***************
*** 338,342 ****
  			# Mouse
  			elif (event == Blender.Draw.MOUSEX):
! 				# check if mouse is inside postionRect
  				if (value >= (self.guiRect[0] + self.positionRect[0])) and (value <= (self.guiRect[0] + self.positionRect[2])):
  					# redraw if marker got focus
--- 339,343 ----
  			# Mouse
  			elif (event == Blender.Draw.MOUSEX):
! 				# check if mouse is inside positionRect
  				if (value >= (self.guiRect[0] + self.positionRect[0])) and (value <= (self.guiRect[0] + self.positionRect[2])):
  					# redraw if marker got focus
***************
*** 1270,1274 ****
  	def getElements(self):
  		return self.elementDict.keys()
! 	def getPostion(self):
  		return self.elementDict['position']
  	def getNormal(self):
--- 1271,1275 ----
  	def getElements(self):
  		return self.elementDict.keys()
! 	def getPosition(self):
  		return self.elementDict['position']
  	def getNormal(self):
***************
*** 1362,1366 ****
  		s = self._indent(indent) + "<vertex>\n"
  		if keyList.count('position'):
! 			position = self.xmlVertex.getPostion()
  			s += self._indent(indent+1)+"<position x=\"%.6f\" y=\"%.6f\" z=\"%.6f\"/>\n" % tuple(position)
  		if keyList.count('normal'):
--- 1363,1367 ----
  		s = self._indent(indent) + "<vertex>\n"
  		if keyList.count('position'):
! 			position = self.xmlVertex.getPosition()
  			s += self._indent(indent+1)+"<position x=\"%.6f\" y=\"%.6f\" z=\"%.6f\"/>\n" % tuple(position)
  		if keyList.count('normal'):
***************
*** 1945,1952 ****
  			# postcondition: vertex is current vertex
  			face_vertices[i] = vertex
! 		# Split faces with more than 3 vertices
! 		Face(submesh, face_vertices[0], face_vertices[1], face_vertices[2])
! 		if len(face.v) == 4:
! 			Face(submesh, face_vertices[2], face_vertices[3], face_vertices[0])
  	else:
  		exportLogger.logWarning("Ignored face with %d edges." % len(face.v))
--- 1946,1965 ----
  			# postcondition: vertex is current vertex
  			face_vertices[i] = vertex
! 		
! 		if len(face.v) == 3:
! 			Face(submesh, face_vertices[0], face_vertices[1], face_vertices[2])
! 		elif len(face.v) == 4:
! 			# Split faces with 4 vertices on the shortest edge
! 			differenceVectorList = [[0,0,0],[0,0,0]]
! 			for indexOffset in range(2):
! 				for coordinate in range(3):
! 					differenceVectorList[indexOffset][coordinate] = face_vertices[indexOffset].xmlVertex.getPosition()[coordinate] \
! 					                                              - face_vertices[indexOffset+2].xmlVertex.getPosition()[coordinate]
! 			if Mathutils.Vector(differenceVectorList[0]).length < Mathutils.Vector(differenceVectorList[1]).length:
! 				Face(submesh, face_vertices[0], face_vertices[1], face_vertices[2])
! 				Face(submesh, face_vertices[2], face_vertices[3], face_vertices[0])
! 			else:
! 				Face(submesh, face_vertices[0], face_vertices[1], face_vertices[3])
! 				Face(submesh, face_vertices[3], face_vertices[1], face_vertices[2])
  	else:
  		exportLogger.logWarning("Ignored face with %d edges." % len(face.v))
***************
*** 2061,2065 ****
  
  def tab(tabsize):
!     return "  " * tabsize
      
  def clamp(val):
--- 2074,2078 ----
  
  def tab(tabsize):
!     return "\t" * tabsize
      
  def clamp(val):
***************
*** 2240,2243 ****
--- 2253,2376 ----
    return
  
+ def writeBumpMapMaterial(file, colorImage, bumpImage):
+ 	file.write("""	technique
+ 	{
+ 		pass
+ 		{
+ 			ambient 1 1 1
+ 			diffuse 0 0 0 
+ 			specular 0 0 0 0
+ 			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTexture
+ 			{
+ 				param_named_auto worldViewProj worldviewproj_matrix
+ 				param_named_auto ambient ambient_light_colour
+ 			}
+ 		}
+ 		pass
+ 		{
+ 			ambient 0 0 0 
+ 			iteration once_per_light
+ 			scene_blend add
+ 			vertex_program_ref Examples/BumpMapVPSpecular
+ 			{
+ 				param_named_auto lightPosition light_position_object_space 0
+ 				param_named_auto eyePosition camera_position_object_space
+ 				param_named_auto worldViewProj worldviewproj_matrix
+ 			}
+ 			fragment_program_ref Examples/BumpMapFPSpecular
+ 			{
+ 				param_named_auto lightDiffuse light_diffuse_colour 0 
+ 				param_named_auto lightSpecular light_specular_colour 0
+ 			}
+ 			texture_unit
+ 			{
+ 				texture %s
+ 				colour_op replace
+ 			}
+ 			texture_unit
+ 			{
+ 				cubic_texture nm.png combinedUVW
+ 				tex_coord_set 1
+ 				tex_address_mode clamp
+ 			}
+ 			texture_unit
+ 			{
+ 				cubic_texture nm.png combinedUVW
+ 				tex_coord_set 2
+ 				tex_address_mode clamp
+ 			}
+ 		}
+ 		pass
+ 		{
+ 			lighting off
+ 			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTexture
+ 			{
+ 				param_named_auto worldViewProj worldviewproj_matrix
+ 				param_named ambient float4 1 1 1 1
+ 			}
+ 			scene_blend dest_colour zero
+ 			texture_unit
+ 			{
+ 				texture %s
+ 			}
+ 		}
+ 	}
+ 	technique
+ 	{
+ 		pass
+ 		{
+ 			ambient 1 1 1
+ 			diffuse 0 0 0 
+ 			specular 0 0 0 0
+ 			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTexture
+ 			{
+ 				param_named_auto worldViewProj worldviewproj_matrix
+ 				param_named_auto ambient ambient_light_colour
+ 			}
+ 		}
+ 		pass
+ 		{
+ 			ambient 0 0 0 
+ 			iteration once_per_light
+ 			scene_blend add
+ 			vertex_program_ref Examples/BumpMapVP
+ 			{
+ 				param_named_auto lightPosition light_position_object_space 0
+ 				param_named_auto eyePosition camera_position_object_space
+ 				param_named_auto worldViewProj worldviewproj_matrix
+ 			}
+ 			texture_unit
+ 			{
+ 				texture %s
+ 				colour_op replace
+ 			}
+ 			texture_unit
+ 			{
+ 				cubic_texture nm.png combinedUVW
+ 				tex_coord_set 1
+ 				tex_address_mode clamp
+ 				colour_op_ex dotproduct src_texture src_current
+ 				colour_op_multipass_fallback dest_colour zero
+ 			}
+ 		}
+ 		pass
+ 		{
+ 			lighting off
+ 			vertex_program_ref Ogre/BasicVertexPrograms/AmbientOneTexture
+ 			{
+ 				param_named_auto worldViewProj worldviewproj_matrix
+ 				param_named ambient float4 1 1 1 1
+ 			}
+ 			scene_blend dest_colour zero
+ 			texture_unit
+ 			{
+ 				texture %s
+ 			}
+ 		}
+ 	}
+ }
+ """ % (colorImage, bumpImage, colorImage, bumpImage))	
+ 	return
+ 
  def write_materials():
  	global pathString, materialString, exportLogger
***************
*** 2257,2336 ****
  			else:
  				f.write(tab(1)+"receive_shadows off\n")
! 		# technique
! 		f.write(tab(1)+"technique\n")
! 		f.write(tab(1)+"{\n")
! 		# pass
! 		f.write(tab(2)+"pass\n")
! 		f.write(tab(2)+"{\n")
! 		if material.mat:
! 			# pass attributes
! 			mat = material.mat
! 			if (not(mat.mode & Blender.Material.Modes["TEXFACE"])):
! 				# world = Blender.World.GetActive()
! 				world = None
! 				worldList = Blender.World.Get()
! 				if (worldList):
! 					if (Blender.Get("version") < 234):
! 						# Blender.World.GetActive() not available
! 						world = worldList[0]
! 						exportLogger.logWarning("Can't get active world. Used ambient colour of world \"%s\"" % world.name)
! 					elif (Blender.Get("version") == 234):
! 						world = Blender.World.GetActive()
! 					else:
! 						world = Blender.World.GetCurrent() 
! 				if (world):
! 					ambientRGBList = world.getAmb()
! 					# ambient <- amb * world ambient RGB
! 					ambR = clamp(mat.amb * ambientRGBList[0])
! 					ambG = clamp(mat.amb * ambientRGBList[1])
! 					ambB = clamp(mat.amb * ambientRGBList[2])
! 					f.write(tab(3)+"ambient %f %f %f\n" % (ambR, ambG, ambB))
! 				if (not(mat.mode & Blender.Material.Modes["VCOL_PAINT"])):
! 					# diffuse <- rgbCol
! 					diffR = clamp(mat.rgbCol[0])
! 					diffG = clamp(mat.rgbCol[1])
! 					diffB = clamp(mat.rgbCol[2])
! 					f.write(tab(3)+"diffuse %f %f %f\n" % (diffR, diffG, diffB))
! 				# specular <- spec * specCol, hard
! 				specR = clamp(mat.spec * mat.specCol[0])
! 				specG = clamp(mat.spec * mat.specCol[1])
! 				specB = clamp(mat.spec * mat.specCol[2])
! 				specShine = mat.hard
! 				f.write(tab(3)+"specular %f %f %f %f\n" % (specR, specG, specB, specShine))
! 				if(not(mat.mode & Blender.Material.Modes["VCOL_PAINT"])):
! 					# emissive <-emit * rgbCol
! 					emR = clamp(mat.emit * mat.rgbCol[0])
! 					emG = clamp(mat.emit * mat.rgbCol[1])
! 					emB = clamp(mat.emit * mat.rgbCol[2])
! 					f.write(tab(3)+"emissive %f %f %f\n" % (emR, emG, emB))
! 			# depth_func  <- ZINVERT; ENV
! 			if (mat.mode & Blender.Material.Modes["ENV"]):
! 				f.write(tab(3)+"depth_func always_fail\n")
! 			elif (mat.mode & Blender.Material.Modes["ZINVERT"]):
! 				f.write(tab(3)+"depth_func greater_equal\n")
! 			# lighting <- SHADELESS
! 			if (mat.mode & Blender.Material.Modes["SHADELESS"]):
! 				f.write(tab(3)+"lighting off\n")
! 			# fog_override <- NOMIST
! 			if (mat.mode & Blender.Material.Modes["NOMIST"]):
! 				f.write(tab(3)+"fog_override true\n")
! 		elif not(material.texture):
! 			# default material
! 			f.write(tab(3)+"ambient 0.5 0.22 0.5\n")
! 			f.write(tab(3)+"diffuse 1.0 0.44 0.1\n")
! 			f.write(tab(3)+"specular 0.5 0.22 0.5 50.0\n")
! 			f.write(tab(3)+"emissive 0.0 0.0 0.0\n")
! 		# scene_blend <- transp
! 		if (material.mode == Blender.NMesh.FaceTranspModes["ALPHA"]):
! 			f.write(tab(3)+"scene_blend alpha_blend \n")
! 		elif (material.mode == Blender.NMesh.FaceTranspModes["ADD"]):
! 			f.write(tab(3)+"scene_blend add\n")
! 		if material.texture:
! 			f.write(tab(3)+"texture_unit\n")
! 			f.write(tab(3)+"{\n")
! 			f.write(tab(4)+"texture %s\n" % os.path.basename(material.texture))
! 			f.write(tab(3)+"}\n") # texture_unit
! 		f.write(tab(2)+"}\n") # pass
! 		f.write(tab(1)+"}\n") # technique
  		f.write("}\n\n") # material
  	f.close()
--- 2390,2485 ----
  			else:
  				f.write(tab(1)+"receive_shadows off\n")
! 		# check material texture maps
! 		hasBumpMap = 0
! 		iMaterialTexture = 0
! 		if material.mat and material.texture:
! 			while ((not hasBumpMap) and (iMaterialTexture < 8)):
! 				materialTexture = material.mat.getTextures()[iMaterialTexture]
! 				iMaterialTexture += 1
! 				if ((materialTexture is not None) \
! 					and (materialTexture.mapto & Blender.Texture.MapTo['NOR']) \
! 					and (materialTexture.texco & Blender.Texture.TexCo['UV']) \
! 					and (materialTexture.tex.type == Blender.Texture.Types.IMAGE)):
! 						# face has uv texture and material has enabled image texture, map input uv, map to nor
! 						writeBumpMapMaterial(f, os.path.basename(materialTexture.tex.image.filename), os.path.basename(material.texture))
! 						hasBumpMap = 1
! 		if not hasBumpMap:
! 			# without material texture maps
! 			# technique
! 			f.write(tab(1)+"technique\n")
! 			f.write(tab(1)+"{\n")
! 			# pass
! 			f.write(tab(2)+"pass\n")
! 			f.write(tab(2)+"{\n")
! 			if material.mat:
! 				# pass attributes
! 				mat = material.mat
! 				if (not(mat.mode & Blender.Material.Modes["TEXFACE"])):
! 					# world = Blender.World.GetActive()
! 					world = None
! 					worldList = Blender.World.Get()
! 					if (worldList):
! 						if (Blender.Get("version") < 234):
! 							# Blender.World.GetActive() not available
! 							world = worldList[0]
! 							exportLogger.logWarning("Can't get active world. Used ambient colour of world \"%s\"" % world.name)
! 						elif (Blender.Get("version") == 234):
! 							world = Blender.World.GetActive()
! 						else:
! 							world = Blender.World.GetCurrent() 
! 					if (world):
! 						ambientRGBList = world.getAmb()
! 						# ambient <- amb * world ambient RGB
! 						ambR = clamp(mat.amb * ambientRGBList[0])
! 						ambG = clamp(mat.amb * ambientRGBList[1])
! 						ambB = clamp(mat.amb * ambientRGBList[2])
! 						f.write(tab(3)+"ambient %f %f %f\n" % (ambR, ambG, ambB))
! 					if (not(mat.mode & Blender.Material.Modes["VCOL_PAINT"])):
! 						# diffuse <- rgbCol
! 						diffR = clamp(mat.rgbCol[0])
! 						diffG = clamp(mat.rgbCol[1])
! 						diffB = clamp(mat.rgbCol[2])
! 						f.write(tab(3)+"diffuse %f %f %f\n" % (diffR, diffG, diffB))
! 					# specular <- spec * specCol, hard
! 					specR = clamp(mat.spec * mat.specCol[0])
! 					specG = clamp(mat.spec * mat.specCol[1])
! 					specB = clamp(mat.spec * mat.specCol[2])
! 					specShine = mat.hard
! 					f.write(tab(3)+"specular %f %f %f %f\n" % (specR, specG, specB, specShine))
! 					if(not(mat.mode & Blender.Material.Modes["VCOL_PAINT"])):
! 						# emissive <-emit * rgbCol
! 						emR = clamp(mat.emit * mat.rgbCol[0])
! 						emG = clamp(mat.emit * mat.rgbCol[1])
! 						emB = clamp(mat.emit * mat.rgbCol[2])
! 						f.write(tab(3)+"emissive %f %f %f\n" % (emR, emG, emB))
! 				# depth_func  <- ZINVERT; ENV
! 				if (mat.mode & Blender.Material.Modes["ENV"]):
! 					f.write(tab(3)+"depth_func always_fail\n")
! 				elif (mat.mode & Blender.Material.Modes["ZINVERT"]):
! 					f.write(tab(3)+"depth_func greater_equal\n")
! 				# lighting <- SHADELESS
! 				if (mat.mode & Blender.Material.Modes["SHADELESS"]):
! 					f.write(tab(3)+"lighting off\n")
! 				# fog_override <- NOMIST
! 				if (mat.mode & Blender.Material.Modes["NOMIST"]):
! 					f.write(tab(3)+"fog_override true\n")
! 			elif not(material.texture):
! 				# default material
! 				f.write(tab(3)+"ambient 0.5 0.22 0.5\n")
! 				f.write(tab(3)+"diffuse 1.0 0.44 0.1\n")
! 				f.write(tab(3)+"specular 0.5 0.22 0.5 50.0\n")
! 				f.write(tab(3)+"emissive 0.0 0.0 0.0\n")
! 			# scene_blend <- transp
! 			if (material.mode == Blender.NMesh.FaceTranspModes["ALPHA"]):
! 				f.write(tab(3)+"scene_blend alpha_blend \n")
! 			elif (material.mode == Blender.NMesh.FaceTranspModes["ADD"]):
! 				f.write(tab(3)+"scene_blend add\n")
! 			if material.texture:
! 				f.write(tab(3)+"texture_unit\n")
! 				f.write(tab(3)+"{\n")
! 				f.write(tab(4)+"texture %s\n" % os.path.basename(material.texture))
! 				f.write(tab(3)+"}\n") # texture_unit
! 			f.write(tab(2)+"}\n") # pass
! 			f.write(tab(1)+"}\n") # technique
  		f.write("}\n\n") # material
  	f.close()

Update of /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18370/Tools/3dsmaxExport/scripts/ogre/lib

Modified Files:
	OgreSkeletonLib_meshfns.ms 
Log Message:
fix a bug for multi uv export

Index: OgreSkeletonLib_meshfns.ms
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/lib/OgreSkeletonLib_meshfns.ms,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** OgreSkeletonLib_meshfns.ms	29 Nov 2004 15:39:16 -0000	1.12
--- OgreSkeletonLib_meshfns.ms	29 Nov 2004 18:15:34 -0000	1.13
***************
*** 246,253 ****
  			(
  				UVcoords=#();
- 				local vertInds = getTVFace tmesh face ;
  				for ch=1 to numUVsets do
  				(
! 					UVW = meshOp.getMapVert tmesh ch vertInds[localVertexIndex] ;	-- retrieve the UV for the corresponding channel.
  					append UVcoords UVW[1];
  					append UVcoords UVW[2];							-- don't care about the W coordinate
--- 246,253 ----
  			(
  				UVcoords=#();
  				for ch=1 to numUVsets do
  				(
! 					local vertInds = meshOp.getMapFace tmesh ch face ;
! 					local UVW = meshOp.getMapVert tmesh ch vertInds[localVertexIndex] ;	-- retrieve the UV for the corresponding channel.
  					append UVcoords UVW[1];
  					append UVcoords UVW[2];							-- don't care about the W coordinate

Update of /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/macros
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12765/Tools/3dsmaxExport/scripts/ogre/macros

Modified Files:
	ogreToolbar.mcr 
Log Message:
fix a bug when exporting tutorial files skateboard.max

Index: ogreToolbar.mcr
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/macros/ogreToolbar.mcr,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ogreToolbar.mcr	29 Nov 2004 10:19:34 -0000	1.12
--- ogreToolbar.mcr	29 Nov 2004 17:50:23 -0000	1.13
***************
*** 129,133 ****
  
  			select = getCurrentSelection() ;
! 			if ((select[1]!=undefined) and (classof select[1]==Editable_mesh)) then
  			(
  				editObject.text = select[1].name ;
--- 129,133 ----
  
  			select = getCurrentSelection() ;
! 			if ((select[1]!=undefined) and (iskindof select[1] GeometryClass)) then
  			(
  				editObject.text = select[1].name ;
***************
*** 150,154 ****
  			max tool hlist ;
  			select = getCurrentSelection() ;
! 			if ((select[1]!=undefined) and (classof select[1]==Editable_mesh)) then
  			(
  				editObject.text = select[1].name ;
--- 150,154 ----
  			max tool hlist ;
  			select = getCurrentSelection() ;
! 			if ((select[1]!=undefined) and (iskindof select[1] GeometryClass)) then
  			(
  				editObject.text = select[1].name ;
***************
*** 234,238 ****
  				(
  					select = getCurrentSelection() ;
! 					if ((select[1]!=undefined) and (classof select[1]==Editable_mesh)) then
  					(
  						mat = select[1].material
--- 234,238 ----
  				(
  					select = getCurrentSelection() ;
! 					if ((select[1]!=undefined) and (iskindof select[1] GeometryClass)) then
  					(
  						mat = select[1].material
***************
*** 336,340 ****
  
  			select = getCurrentSelection() ;
! 			if ((select[1]!=undefined) and (classof select[1]==Editable_mesh)) then
  			(
  				OgreExportMesh.CBexportMesh.enabled = true;
--- 336,340 ----
  
  			select = getCurrentSelection() ;
! 			if ((select[1]!=undefined) and (iskindof select[1] GeometryClass)) then
  			(
  				OgreExportMesh.CBexportMesh.enabled = true;
***************
*** 343,350 ****
  				OgreExportMesh.CBexportColor.enabled = true ;
  				OgreExportMesh.CBexportUV.enabled = true ;
! 				if (getNumTVerts select[1] == 0) then
! 					OgreExportMesh.CBexportUV.checked = false ;
  				else
! 					OgreExportMesh.CBexportUV.checked = true ;
  				OgreExportMesh.SPchannels.enabled = true ;
  			)
--- 343,357 ----
  				OgreExportMesh.CBexportColor.enabled = true ;
  				OgreExportMesh.CBexportUV.enabled = true ;
! 				if (classof select[1] == Editable_Mesh) then
! 				(
! 					if (getNumTVerts select[1] == 0) then
! 						OgreExportMesh.CBexportUV.checked = false ;
! 					else
! 						OgreExportMesh.CBexportUV.checked = true ;
! 				)
  				else
! 				(
! 					OgreExportMesh.CBexportUV.checked = false ;
! 				)
  				OgreExportMesh.SPchannels.enabled = true ;
  			)
***************
*** 411,415 ****
  
  			select = getCurrentSelection() ;
! 			if ((select[1]!=undefined) and (classof select[1]==Editable_mesh)) then
  			(
  				OgreExportAnimation.CBexportSkeleton.enabled = (getSkin(select[1]) != undefined) or (getPhysique(select[1]) != undefined) ;
--- 418,422 ----
  
  			select = getCurrentSelection() ;
! 			if ((select[1]!=undefined) and (iskindof select[1] GeometryClass)) then
  			(
  				OgreExportAnimation.CBexportSkeleton.enabled = (getSkin(select[1]) != undefined) or (getPhysique(select[1]) != undefined) ;
***************
*** 438,442 ****
  		(
  			select = getCurrentSelection() ;
! 			if ((select[1]!=undefined) and (classof select[1]==Editable_mesh)) then
  			(
  				--OgreExportAnimation.CBbiped.enabled = state;
--- 445,449 ----
  		(
  			select = getCurrentSelection() ;
! 			if ((select[1]!=undefined) and (iskindof select[1] GeometryClass)) then
  			(
  				--OgreExportAnimation.CBbiped.enabled = state;
***************
*** 460,464 ****
  		(
  			select = getCurrentSelection()
! 			if ((select[1]!=undefined) and (classof select[1]==Editable_mesh)) then
  			(
  				max modify mode ;
--- 467,471 ----
  		(
  			select = getCurrentSelection()
! 			if ((select[1]!=undefined) and (iskindof select[1] GeometryClass)) then
  			(
  				max modify mode ;
***************
*** 571,575 ****
  
  			select = getCurrentSelection() ;
! 			if ((select[1]!=undefined) and (classof select[1]==Editable_mesh)) then
  			(
  				CBexportmaterial.enabled = true;
--- 578,582 ----
  
  			select = getCurrentSelection() ;
! 			if ((select[1]!=undefined) and (iskindof select[1] GeometryClass)) then
  			(
  				CBexportmaterial.enabled = true;

Update of /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8719/Tools/3dsmaxExport/scripts/ogre/lib

Modified Files:
	OgreSkeletonLib_meshfns.ms 
Log Message:
fix a bug in uv export

Index: OgreSkeletonLib_meshfns.ms
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/lib/OgreSkeletonLib_meshfns.ms,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** OgreSkeletonLib_meshfns.ms	28 Nov 2004 22:06:05 -0000	1.11
--- OgreSkeletonLib_meshfns.ms	29 Nov 2004 15:39:16 -0000	1.12
***************
*** 136,141 ****
--- 136,149 ----
  		if (exportUV) then
  		(
+ 			local equal = true;
  			for i=1 to UVs.count do
+ 			(
  				if (vertex[start_uvs+i]!=UVs[i]) then
+ 				(
+ 					equal = false;
+ 					exit;
+ 				)
+ 			)
+ 			if (not equal) then 
  				continue;
  		)
***************
*** 241,245 ****
  				for ch=1 to numUVsets do
  				(
- 				
  					UVW = meshOp.getMapVert tmesh ch vertInds[localVertexIndex] ;	-- retrieve the UV for the corresponding channel.
  					append UVcoords UVW[1];
--- 249,252 ----
***************
*** 266,270 ****
  			(
  				newVertex = 1 ;
! 				--format "nouveau vertex % %\n" (getVert tmesh vertexIndex) vertexNormal;
  			)
  			else
--- 273,277 ----
  			(
  				newVertex = 1 ;
! 				--format "nouveau vertex % % %\n" vertexIndex vertexNormal UVcoords;
  			)
  			else
***************
*** 518,522 ****
  			(
  				for ch=1 to numUVsets do
! 					format("\t\t\t\t\t\t<texcoord u=\"%\" v=\"%\" />\n") v[11+(ch-1)*2] (1 - v[12+(ch-1)*2]) to:outFile ;		
  			)
  			if (exportColours) then 
--- 525,529 ----
  			(
  				for ch=1 to numUVsets do
! 					format("\t\t\t\t\t\t<texcoord u=\"%\" v=\"%\" />\n") v[11+((ch-1)*2)] (1 - v[12+((ch-1)*2)]) to:outFile ;		
  			)
  			if (exportColours) then

Update of /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11260/Tools/3dsmaxExport/scripts/ogre/lib

Modified Files:
	OgreBipedLib.ms 
Log Message:
Allows to link helpers (Point helpers or Dummy) to the hierarchy. Helpers will be exported only if they are part of the skin or physique modifier.

Index: OgreBipedLib.ms
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/lib/OgreBipedLib.ms,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OgreBipedLib.ms	28 Nov 2004 22:06:05 -0000	1.3
--- OgreBipedLib.ms	29 Nov 2004 13:30:00 -0000	1.4
***************
*** 260,263 ****
--- 260,291 ----
  )
  
+ function addHelpersToHierarchy phy sk =
+ (
+ 	if (sk != undefined) then
+ 	(
+ 		for i=1 to (skinOps.GetNumberBones sk) do
+ 		(
+ 			bname = skinOps.GetBoneName sk i 1 ;
+ 			replaceSpaces bname ;
+ 			d = execute ("$" + bname) ;
+ 
+ 			if (iskindof d helper) then
+ 				append BonesList bname ;
+ 		)	
+ 	)
+ 	else if (phy != undefined) then
+ 	(
+ 		for i=1 to (physiqueOps.GetBoneCount $) do
+ 		(
+ 			bname = (physiqueOps.GetBones $)[i].name;
+ 			replaceSpaces bname ;
+ 			d = execute ("$" + bname) ;
+ 		
+ 			if (iskindof d helper) then
+ 				append BonesList bname ;
+ 		)	
+ 	)
+ )
+ 
  -----------------------------------------------------------------
  -- find the root(s) of the rhierarchy
***************
*** 342,346 ****
  function computeBonesList phy sk =
  (
! 	rootnodes = getHierarchyRoots phy sk ;
  	print rootsnode
  	for b in rootnodes do
--- 370,374 ----
  function computeBonesList phy sk =
  (
! 	rootnodes = getHierarchyRoots phy sk ;	-- find the roots of the current hierarchy
  	print rootsnode
  	for b in rootnodes do
***************
*** 348,351 ****
--- 376,383 ----
  		computeBList b;
  	)
+ 	
+ 	-- add the nodes that are parts of the skin (or physique) modifier but are neither biped_object nor standard bones
+ 	-- only helpers (Point, Dummy) at the moment...
+ 	addHelpersToHierarchy phy sk ;
  )

Update of /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/macros
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv642/Tools/3dsmaxExport/scripts/ogre/macros

Modified Files:
	ogreToolbar.mcr 
Log Message:


Index: ogreToolbar.mcr
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Tools/3dsmaxExport/scripts/ogre/macros/ogreToolbar.mcr,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ogreToolbar.mcr	28 Nov 2004 22:06:06 -0000	1.11
--- ogreToolbar.mcr	29 Nov 2004 10:19:34 -0000	1.12
***************
*** 463,467 ****
  			(
  				max modify mode ;
! 				modPanel.setCurrentObject select[1].modifiers["OctopusExport"] ;
  				octexp = getOctopusExport select[1];
  				
--- 463,468 ----
  			(
  				max modify mode ;
! 				--if (select[1].modifiers["OctopusExport"]!=undefined) then
! 				--	modPanel.setCurrentObject select[1].modifiers["OctopusExport"] ;
  				octexp = getOctopusExport select[1];

Update of /cvsroot/ogre/ogrenew/Samples/Shadows/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21709/Samples/Shadows/src

Modified Files:
      Tag: resource-unstable
	Shadows.cpp 
Log Message:
Overlay* -> OverlayPtr

Index: Shadows.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Samples/Shadows/src/Shadows.cpp,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** Shadows.cpp	12 Nov 2004 21:54:09 -0000	1.13
--- Shadows.cpp	28 Nov 2004 23:06:11 -0000	1.13.2.1
***************
*** 410,414 ****
  
          // show overlay
!         Overlay *pOver = (Overlay *)OverlayManager::getSingleton().getByName("Example/ShadowsOverlay");    
          mShadowTechniqueInfo = GuiManager::getSingleton().getOverlayElement("Example/Shadows/ShadowTechniqueInfo");
          mMaterialInfo = GuiManager::getSingleton().getOverlayElement("Example/Shadows/MaterialInfo");
--- 410,414 ----
  
          // show overlay
!         OverlayPtr pOver = OverlayManager::getSingleton().getByName("Example/ShadowsOverlay");    
          mShadowTechniqueInfo = GuiManager::getSingleton().getOverlayElement("Example/Shadows/ShadowTechniqueInfo");
          mMaterialInfo = GuiManager::getSingleton().getOverlayElement("Example/Shadows/MaterialInfo");

Update of /cvsroot/ogre/ogrenew/Samples/Gui/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21709/Samples/Gui/include

Modified Files:
      Tag: resource-unstable
	Gui.h 
Log Message:
Overlay* -> OverlayPtr

Index: Gui.h
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Samples/Gui/include/Gui.h,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** Gui.h	12 Nov 2004 04:32:48 -0000	1.11
--- Gui.h	28 Nov 2004 23:06:11 -0000	1.11.2.1
***************
*** 88,92 ****
  
          // A bit of a hacky test
!         Overlay* o = (Overlay*)OverlayManager::getSingleton().getByName("SS/Setup/HostScreen/Overlay");
  		ActionTarget* at = static_cast<BorderButtonGuiElement*>(GuiManager::getSingleton().getOverlayElement("SS/Setup/HostScreen/Join"));
  		at->addActionListener(this);
--- 88,92 ----
  
          // A bit of a hacky test
!         OverlayPtr o = OverlayManager::getSingleton().getByName("SS/Setup/HostScreen/Overlay");
  		ActionTarget* at = static_cast<BorderButtonGuiElement*>(GuiManager::getSingleton().getOverlayElement("SS/Setup/HostScreen/Join"));
  		at->addActionListener(this);

Update of /cvsroot/ogre/ogrenew/Samples/Dot3Bump/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21709/Samples/Dot3Bump/src

Modified Files:
      Tag: resource-unstable
	Dot3Bump.cpp 
Log Message:
Overlay* -> OverlayPtr

Index: Dot3Bump.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Samples/Dot3Bump/src/Dot3Bump.cpp,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -C2 -d -r1.19 -r1.19.2.1
*** Dot3Bump.cpp	12 Nov 2004 04:32:48 -0000	1.19
--- Dot3Bump.cpp	28 Nov 2004 23:06:10 -0000	1.19.2.1
***************
*** 280,284 ****
  		mCamera->lookAt(0, 0, 0);
  		// show overlay
! 		Overlay *pOver = (Overlay *)OverlayManager::getSingleton().getByName("Example/DP3Overlay");    
          mObjectInfo = GuiManager::getSingleton().getOverlayElement("Example/DP3/ObjectInfo");
          mMaterialInfo = GuiManager::getSingleton().getOverlayElement("Example/DP3/MaterialInfo");
--- 280,284 ----
  		mCamera->lookAt(0, 0, 0);
  		// show overlay
! 		OverlayPtr pOver = OverlayManager::getSingleton().getByName("Example/DP3Overlay");    
          mObjectInfo = GuiManager::getSingleton().getOverlayElement("Example/DP3/ObjectInfo");
          mMaterialInfo = GuiManager::getSingleton().getOverlayElement("Example/DP3/MaterialInfo");

Update of /cvsroot/ogre/ogrenew/Samples/CubeMapping/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21709/Samples/CubeMapping/include

Modified Files:
      Tag: resource-unstable
	CubeMapping.h 
Log Message:
Overlay* -> OverlayPtr

Index: CubeMapping.h
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Samples/CubeMapping/include/CubeMapping.h,v
retrieving revision 1.26.2.2
retrieving revision 1.26.2.3
diff -C2 -d -r1.26.2.2 -r1.26.2.3
*** CubeMapping.h	24 Nov 2004 21:11:56 -0000	1.26.2.2
--- CubeMapping.h	28 Nov 2004 23:06:10 -0000	1.26.2.3
***************
*** 710,714 ****
  
  		// show overlay
! 		Overlay *overlay = (Overlay*)OverlayManager::getSingleton().getByName("Example/CubeMappingOverlay");    
  		overlay->show();
  	}
--- 710,714 ----
  
  		// show overlay
! 		OverlayPtr overlay = OverlayManager::getSingleton().getByName("Example/CubeMappingOverlay");    
  		overlay->show();
  	}

Update of /cvsroot/ogre/ogrenew/OgreMain/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21709/OgreMain/src

Modified Files:
      Tag: resource-unstable
	OgreProfiler.cpp 
Log Message:
Overlay* -> OverlayPtr

Index: OgreProfiler.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/src/OgreProfiler.cpp,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** OgreProfiler.cpp	12 Nov 2004 04:32:46 -0000	1.11
--- OgreProfiler.cpp	28 Nov 2004 23:06:08 -0000	1.11.2.1
***************
*** 125,129 ****
  
          // create a new overlay to hold our Profiler display
!         mOverlay = (Overlay*)OverlayManager::getSingleton().create("Profiler");
          mOverlay->setZOrder(500);
  
--- 125,130 ----
  
          // create a new overlay to hold our Profiler display
!         mOverlay = OverlayManager::getSingleton().create("Profiler", 
!             ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
          mOverlay->setZOrder(500);

Update of /cvsroot/ogre/ogrenew/Samples/Common/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21709/Samples/Common/include

Modified Files:
      Tag: resource-unstable
	ExampleFrameListener.h 
Log Message:
Overlay* -> OverlayPtr

Index: ExampleFrameListener.h
===================================================================
RCS file: /cvsroot/ogre/ogrenew/Samples/Common/include/ExampleFrameListener.h,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -C2 -d -r1.36 -r1.36.2.1
*** ExampleFrameListener.h	12 Nov 2004 04:32:47 -0000	1.36
--- ExampleFrameListener.h	28 Nov 2004 23:06:09 -0000	1.36.2.1
***************
*** 50,54 ****
      Real mMoveSpeed;
      Degree mRotateSpeed;
!     Overlay* mDebugOverlay;
  
      void updateStats(void)
--- 50,54 ----
      Real mMoveSpeed;
      Degree mRotateSpeed;
!     OverlayPtr mDebugOverlay;
  
      void updateStats(void)
***************
*** 92,96 ****
      ExampleFrameListener(RenderWindow* win, Camera* cam, bool useBufferedInputKeys = false, bool useBufferedInputMouse = false)
      {
!         mDebugOverlay = (Overlay*)OverlayManager::getSingleton().getByName("Core/DebugOverlay");
          mUseBufferedInputKeys = useBufferedInputKeys;
  		mUseBufferedInputMouse = useBufferedInputMouse;
--- 92,96 ----
      ExampleFrameListener(RenderWindow* win, Camera* cam, bool useBufferedInputKeys = false, bool useBufferedInputMouse = false)
      {
!         mDebugOverlay = OverlayManager::getSingleton().getByName("Core/DebugOverlay");
          mUseBufferedInputKeys = useBufferedInputKeys;
  		mUseBufferedInputMouse = useBufferedInputMouse;

Update of /cvsroot/ogre/ogrenew/ReferenceApplication/Common/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21709/ReferenceApplication/Common/include

Modified Files:
      Tag: resource-unstable
	ExampleRefAppFrameListener.h 
Log Message:
Overlay* -> OverlayPtr

Index: ExampleRefAppFrameListener.h
===================================================================
RCS file: /cvsroot/ogre/ogrenew/ReferenceApplication/Common/include/ExampleRefAppFrameListener.h,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** ExampleRefAppFrameListener.h	12 Nov 2004 22:56:53 -0000	1.6
--- ExampleRefAppFrameListener.h	28 Nov 2004 23:06:08 -0000	1.6.2.1
***************
*** 252,257 ****
      void showDebugOverlay(bool show)
      {   
!         Overlay* o = (Overlay*)OverlayManager::getSingleton().getByName("Core/DebugOverlay");
!         if (!o)
              Except( Exception::ERR_ITEM_NOT_FOUND, "Could not find overlay Core/DebugOverlay",
                  "showDebugOverlay" );
--- 252,257 ----
      void showDebugOverlay(bool show)
      {   
!         OverlayPtr o = OverlayManager::getSingleton().getByName("Core/DebugOverlay");
!         if (o.isNull())
              Except( Exception::ERR_ITEM_NOT_FOUND, "Could not find overlay Core/DebugOverlay",
                  "showDebugOverlay" );