You can subscribe to this list here.
2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(9) |
Jun
(7) |
Jul
(24) |
Aug
(4) |
Sep
(6) |
Oct
(6) |
Nov
(23) |
Dec
(62) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2009 |
Jan
(34) |
Feb
(33) |
Mar
(21) |
Apr
(13) |
May
(8) |
Jun
(15) |
Jul
(8) |
Aug
(10) |
Sep
(22) |
Oct
(3) |
Nov
(4) |
Dec
(15) |
2010 |
Jan
(7) |
Feb
(65) |
Mar
(30) |
Apr
(21) |
May
(15) |
Jun
(15) |
Jul
(25) |
Aug
(14) |
Sep
(11) |
Oct
|
Nov
(3) |
Dec
|
2011 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(1) |
From: <viv...@us...> - 2013-12-03 12:15:53
|
Revision: 2988 http://sourceforge.net/p/ogreaddons/code/2988 Author: vivetech Date: 2013-12-03 12:15:51 +0000 (Tue, 03 Dec 2013) Log Message: ----------- Some remarks added to the changelog of DotSceneFormat Modified Paths: -------------- trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/Documentation/Changelog.txt Modified: trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/Documentation/Changelog.txt =================================================================== --- trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/Documentation/Changelog.txt 2013-09-13 09:28:46 UTC (rev 2987) +++ trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/Documentation/Changelog.txt 2013-12-03 12:15:51 UTC (rev 2988) @@ -12,11 +12,6 @@ dotSceneInterface ----------------- -/*************************************************************************************************************************************/ -Main changes in dotSceneInterface: scene serializer is added. -Description comming soon. -/*************************************************************************************************************************************/ - - dotSceneInterface is now compilable with Ogre Eihort. Fixed some compatibility issues when calling OGRE_EXCEPT. - Placed a copyright notice at the beginning of each file: - The whole project is placed under license LGPL. @@ -73,10 +68,6 @@ -And this is the changelog for the new loader/serializer: - -//---------------------------------- - - All header and source files relating to tinyxml were removed from the project itself. Now they are available separately as a dependency and both dotsceneformat and dotSceneViewer links tinyxml_d.lib/tinyxml.lib. This is to make the project more modular. @@ -347,10 +338,6 @@ -//---------------------------------- - - - Media ----- - TestLevel.material was highly rewritten to support environment mapping with shadow volume based shadowing. Ogre material feature @@ -433,4 +420,54 @@ tinyxml ------- - Tinyxml was used by many of the dotScene projects before, but each project has had its own copy of it. Now tinyxml is kept as a - separate project. \ No newline at end of file + separate project. + +------------------------------------------ +| dotSceneFormat_VC10.sln CHANGES 2013. | +------------------------------------------ + +dotSceneInterface +----------------- +- A new serializer has been implemented for all available elements. +- A new solution named 'dotSceneFormat_VC10.sln' has been created in place of 'dotSceneFormat_VC80.sln' for Microsoft Visual Studio 2010. +- In order to make the serializer function properly, minor changes in OGRE had to be done. There is a patch file in the same folder as the dotSceneFormat_VC10.sln solution named 'ogre_1.8.1.patch' that has to be applied when using OGRE version 1.8.1. +- Three new functions implemented for scene element. +- Version control implemented for the project. + +XmlNodeProcessor +---------------- +- Minor changes were made to the XmlNodeProcessor project. + + +Major remarks +------------- +General: +- 'id' tag cannot be set +- 'type' tag of 'light' element cannot be set to radPoint +- 'userDataReference' tag of 'light' element is not serialized +- 'visibility' tag of 'node' element cannot be set to false +- 'cascadeVisibility' tag of 'node' element cannot be set to false +- 'isTarget' tag of 'node' element cannot be set to false +- 'type' tag cannot be set to numeric for 'animation' element +- 'nodeName' tag of 'lookTarget' element cannot be serialized +- 'relativeTo' tag of 'lookTarget' element cannot be serialized +- 'cameraName' tag of 'viewport' element cannot be set +- 'name' tag is auto prefixed and cannot be set for 'skyplane' element +- 'name' tag cannot be set for 'skydome' element +- 'active' tag of 'renderWindow' element cannot be set to false due to an OGRE particularity +- 'autoUpdated' tag of 'renderWindow' element cannot be set to false due to an OGRE particularity +- 'primary' tag of 'renderWindow' element cannot be set to false due to an OGRE particularity +- 'visible' tag of 'renderWindow' element cannot be set to false due to an OGRE particularity +- missing loading/saving of 'title' tag in 'renderWindow' element +- missing loading for 'colourDepth' tag in 'renderWindow' element +- missing loading of 'depthBuffer' tag in 'renderWindow' element +- missing loading/saving of 'FSAA' tag in 'renderWindow' element +- missing saving of 'displayFrequency' tag in 'renderWindow' element +- missing loading/saving of 'border' tag in 'renderWindow' element +- missing loading/saving of 'outerDimensions' tag in 'renderWindow' element +- 'compositorInstance' element cannot be loaded +- 'angleUnit' tag of 'angle_axis' element can only be saved in degree +- 'vertexAnimationTrack' element cannot be saved +- 'vertexMorphKeyFrame' element cannot be saved +- 'vertexPoseKeyFrame' element cannot be saved +- 'relativeTo' tag of 'resourceLocation' element can only be saved as absolute path This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <viv...@us...> - 2013-09-13 09:28:50
|
Revision: 2987 http://sourceforge.net/p/ogreaddons/code/2987 Author: vivetech Date: 2013-09-13 09:28:46 +0000 (Fri, 13 Sep 2013) Log Message: ----------- Ported to Ogre 1.8.1. Serializer added. Bug fixes. Modified Paths: -------------- trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPCommonParamsOfXmlNodeProcessors.cpp trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPCommonParamsOfXmlNodeProcessors.h trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPDemo.cpp trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPPrerequisites.h trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPXmlNodeProcessor.cpp trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPXmlNodeProcessor.h trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPXmlNodeProcessorTreeBuilder.cpp trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPXmlNodeProcessorTreeBuilder.h trunk/dotsceneformat/Source/Dependencies/trunk/main/HDRLib/lib/HDRLib.lib trunk/dotsceneformat/Source/Dependencies/trunk/main/HDRLib/lib/HDRLib_d.lib trunk/dotsceneformat/Source/Dependencies/trunk/main/HDRLib/src/HDRCompositor.cpp trunk/dotsceneformat/Source/Dependencies/trunk/main/Tinyxml/includes/tinyxml.h trunk/dotsceneformat/Source/Dependencies/trunk/main/Tinyxml/lib/tinyxml.lib trunk/dotsceneformat/Source/Dependencies/trunk/main/Tinyxml/lib/tinyxml_d.lib trunk/dotsceneformat/Source/Dependencies/trunk/main/Tinyxml/src/tinyxml.cpp trunk/dotsceneformat/Source/Dependencies/trunk/main/Tinyxml/src/tinyxmlerror.cpp trunk/dotsceneformat/Source/Dependencies/trunk/main/Tinyxml/src/tinyxmlparser.cpp trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/Documentation/Changelog.txt trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Include/dotSceneInfo.h trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Include/dotSceneInterface.h trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Include/dotSceneNodeProcessorTreeBuilder.h trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Include/dotScenePlatformUtils.h trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Include/dotScenePrerequisites.h trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Include/dotSceneProcessor.h trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Include/dotSceneProcessorImpl.h trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Include/dotSceneProcessorImpl_v1_0_0.h trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Include/dotSceneStableHeaders.h trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Include/dotSceneUtils.h trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Include/dotSceneXmlNodeProcessors.h trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Source/dotSceneInfo.cpp trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Source/dotSceneNodeProcessorTreeBuilder.cpp trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Source/dotScenePlatformUtils.cpp trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Source/dotSceneProcessor.cpp trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Source/dotSceneProcessorImpl_v1_0_0.cpp trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Source/dotSceneResourceManager.cpp trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Source/dotSceneUtils.cpp trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Source/dotSceneXmlNodeProcessors.cpp trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneViewer/Include/ExampleApplication.h trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneViewer/Include/ExampleFrameListener.h trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneViewer/Include/dotSceneViewerApplication.h trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneViewer/Include/dotSceneViewerFrameListener.h trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneViewer/Include/dotSceneViewerMovableText.h trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneViewer/Source/dotSceneViewerApplication.cpp trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneViewer/Source/dotSceneViewerFrameListener.cpp Added Paths: ----------- trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XmlNodeProcessor.vcxproj trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XmlNodeProcessor.vcxproj.filters trunk/dotsceneformat/Source/Dependencies/trunk/main/HDRLib/HDRLib.vcxproj trunk/dotsceneformat/Source/Dependencies/trunk/main/HDRLib/HDRLib.vcxproj.filters trunk/dotsceneformat/Source/Dependencies/trunk/main/Tinyxml/tinyxml.vcxproj trunk/dotsceneformat/Source/Dependencies/trunk/main/Tinyxml/tinyxml.vcxproj.filters trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/Source/dotSceneXmlNodeSerializers.cpp trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/dotSceneInterface_VC10.sln trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/dotSceneInterface_VC10.suo trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/dotSceneInterface_VC10.vcxproj trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneInterface/dotSceneInterface_VC10.vcxproj.filters trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneOctreeSceneManager/DotSceneOctreeSceneManager.vcxproj trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneOctreeSceneManager/DotSceneOctreeSceneManager.vcxproj.filters trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneToDotSceneOctreeConverter/DotSceneToDotSceneOctreeConverter.vcxproj trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneToDotSceneOctreeConverter/DotSceneToDotSceneOctreeConverter.vcxproj.filters trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneViewer/DotSceneViewer_VC10.vcxproj trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/DotSceneViewer/DotSceneViewer_VC10.vcxproj.user trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/dotSceneFormat_VC10.sln trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/dotSceneFormat_VC10.suo trunk/dotsceneformat/Source/Graphics Engine/trunk/main/SceneFormats/DotSceneFormat/ogre_1.8.1.patch Modified: trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPCommonParamsOfXmlNodeProcessors.cpp =================================================================== --- trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPCommonParamsOfXmlNodeProcessors.cpp 2011-09-08 00:03:46 UTC (rev 2986) +++ trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPCommonParamsOfXmlNodeProcessors.cpp 2013-09-13 09:28:46 UTC (rev 2987) @@ -1,6 +1,6 @@ /* ----------------------------------------------------------------------------- -Author: Balazs Hajdics (wol...@fr...) +Author: Balazs Hajdics (wol...@fr...), James Le Cuirot Copyright (C) 2007 Balazs Hajdics @@ -23,8 +23,8 @@ /// Copyright (C) 2007 Balazs Hajdics +#include "XNPCommonParamsOfXmlNodeProcessors.h" #include "XNPPrerequisites.h" -#include "XNPCommonParamsOfXmlNodeProcessors.h" namespace XmlNodeProcessing { Modified: trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPCommonParamsOfXmlNodeProcessors.h =================================================================== --- trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPCommonParamsOfXmlNodeProcessors.h 2011-09-08 00:03:46 UTC (rev 2986) +++ trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPCommonParamsOfXmlNodeProcessors.h 2013-09-13 09:28:46 UTC (rev 2987) @@ -1,6 +1,6 @@ /* ----------------------------------------------------------------------------- -Author: Balazs Hajdics (wol...@fr...) +Author: Balazs Hajdics (wol...@fr...), James Le Cuirot Copyright (C) 2007 Balazs Hajdics Modified: trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPDemo.cpp =================================================================== --- trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPDemo.cpp 2011-09-08 00:03:46 UTC (rev 2986) +++ trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPDemo.cpp 2013-09-13 09:28:46 UTC (rev 2987) @@ -1,5 +1,6 @@ /* ----------------------------------------------------------------------------- +Author: Tibor Tihon (tib...@gm...), Balazs Hajdics (wol...@fr...), James Le Cuirot Copyright (c) 2007 Tibor Tihon This program is free software; you can redistribute it and/or modify it under @@ -200,7 +201,7 @@ void testParseBad() { - TiXmlDocument doc("testBad.xml"); + TiXmlDocument doc("test.scene"); if (!doc.LoadFile()) return; @@ -211,7 +212,7 @@ Listener* lstnr = new Listener(); proc->addParseListener(lstnr); // procComment->addParseListener(lstnr); - proc->parseElement(NULL, doc.FirstChild("ToDo")->ToElement()); + proc->parseElement(NULL, doc.FirstChild("scene")->ToElement()); delete lstnr; delete proc; } @@ -401,7 +402,7 @@ club->addNewPlayer("Dida", 198); XmlClubProcessor* proc = new XmlClubProcessor(); TiXmlDocument doc; - proc->serializeRootElement(doc, "club", club); + proc->serializeRootElement("club", doc, club); doc.SaveFile("testSerialized.xml"); delete proc; delete club; @@ -409,10 +410,10 @@ int main(int argc, char* argv[]) { - //test1(); - //test2(); - //test3(); - //test4(); +// test1(); +// test2(); +// test3(); +// test4(); testParseBad(); return 0; } \ No newline at end of file Modified: trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPPrerequisites.h =================================================================== --- trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPPrerequisites.h 2011-09-08 00:03:46 UTC (rev 2986) +++ trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPPrerequisites.h 2013-09-13 09:28:46 UTC (rev 2987) @@ -1,6 +1,6 @@ /* ----------------------------------------------------------------------------- -Author: Balazs Hajdics (wol...@fr...) +Author: Balazs Hajdics (wol...@fr...), James Le Cuirot Copyright (C) 2007 Balazs Hajdics @@ -46,7 +46,7 @@ //using namespace Common; // Temporarily, as including the whole Ogre.h would result ugly name collisions: - #include "OgreException.h" + //#include "OgreException.h" //------------------- @@ -58,6 +58,7 @@ //---------------------------------------------------------------------------- // Windows Settings + #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 // If we're not including this from a client build, specify that the stuff @@ -80,7 +81,10 @@ # endif #endif // #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 - +#ifndef WIN32 +#define _XmlNodeProcessing_BuildMode +#define _XmlNodeProcessing_BuildModePrivate +#endif typedef std::string String; typedef std::vector<String> StringVector; Modified: trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPXmlNodeProcessor.cpp =================================================================== --- trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPXmlNodeProcessor.cpp 2011-09-08 00:03:46 UTC (rev 2986) +++ trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPXmlNodeProcessor.cpp 2013-09-13 09:28:46 UTC (rev 2987) @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Theory: Balazs Hajdics, Tibor Tihon -Author: Tibor Tihon (tib...@gm...), Balazs Hajdics (wol...@fr...) +Author: Tibor Tihon (tib...@gm...), Balazs Hajdics (wol...@fr...), James Le Cuirot, Ihor Tregubov Copyright (C) 2007 Tibor Tihon, Balazs Hajdics @@ -81,10 +81,11 @@ XmlNodeProcessorMap::iterator it = mElementProcessorMap.find(elementName); if (it == mElementProcessorMap.end()) { - EXCEPT( + return 0; + /*EXCEPT( Ogre::Exception::ERR_ITEM_NOT_FOUND, "XmlNodeProcessor element \"" + elementName + "\" does not exist.", - "XmlNodeProcessor::getElementProcessor()"); + "XmlNodeProcessor::getElementProcessor()");*/ }else return it->second; } const String& XmlNodeProcessor::getElementProcessorName(XmlNodeProcessor* processor) @@ -322,12 +323,17 @@ return mParsedNodes.size() > 0 ? mParsedNodes.top() : NULL; } - void XmlNodeProcessor::serializeChildren(const XmlNodeProcessorVectorItem& item, TiXmlElement& currentNode, void* currentData) + void XmlNodeProcessor::serializeChildren(const XmlNodeProcessorVectorItem& item, TiXmlElement& currentNode, void* pParentData) { - int counter = 0; XmlNodeProcessor* processor = item.first; if (processor == mTextProcessor) { + TiXmlText childText(""); + if( item.first->serializeText( childText, pParentData ) ) + { + currentNode.InsertEndChild(childText); + } + /* bool hasSiblingsToSerialize = processor->hasNodesToSerialize(currentData); while (hasSiblingsToSerialize) { @@ -336,21 +342,27 @@ item.first->serializeText(hasSiblingsToSerialize, childText, currentData, counter++); currentNode.InsertEndChild(childText); } + */ } else if (processor == mCommentProcessor) { - bool hasSiblingsToSerialize = processor->hasNodesToSerialize(currentData); - while (hasSiblingsToSerialize) - { - hasSiblingsToSerialize = false; + TiXmlComment childComment; + if( item.first->serializeComment( childComment, pParentData ) ) + { + currentNode.InsertEndChild(childComment); + } + /* + hasSiblingsToSerialize = false; // TiXmlComment childComment(""); // Old version uses new version of tiny xml. - TiXmlComment childComment; - item.first->serializeComment(hasSiblingsToSerialize, childComment, currentData, counter++); - currentNode.InsertEndChild(childComment); - } + TiXmlComment childComment; + item.first->serializeComment(hasSiblingsToSerialize, childComment, currentData, counter++); + currentNode.InsertEndChild(childComment); + */ } else { + item.first->serializeElement( item.second.c_str(), currentNode, pParentData ); + /* bool hasSiblingsToSerialize = processor->hasNodesToSerialize(currentData); while (hasSiblingsToSerialize) { @@ -359,39 +371,60 @@ item.first->serializeElement(hasSiblingsToSerialize, childElement, currentData, counter++); currentNode.InsertEndChild(childElement); } + */ } } - void* XmlNodeProcessor::serializeElement(bool& hasSiblingsToSerialize, TiXmlElement& currentNode, void* parentData, size_t counter) + bool XmlNodeProcessor::serializeElement( const char* strElementName, TiXmlElement& parentElement, void* pParentData ) { - for (std::set<SerializeListener*>::iterator l = mSerializeListeners.begin(); l != mSerializeListeners.end(); ++l) - if (*l != NULL) - (*l)->preElementSerialize(this, currentNode); + bool bResult = false; - void* currentData = serializeElementImpl(hasSiblingsToSerialize, currentNode, parentData, counter); + size_t counter = 0; - for (XmlNodeProcessorVector::iterator i = mNodeProcessorVector.begin(); i != mNodeProcessorVector.end(); ++i) - serializeChildren(*i, currentNode, currentData); + XmlNodeProcessor::ElementsDataList elementsDataList; + if( serializeElementBeginImpl( parentElement.Value(), pParentData, &elementsDataList ) ) + { + while( elementsDataList.size() ) + { + TiXmlElement NewElement( strElementName ); - if (mDefaultProcessor != NULL) - serializeChildren(XmlNodeProcessorVectorItem(mDefaultProcessor, ""), currentNode, currentData); + for (std::set<SerializeListener*>::iterator l = mSerializeListeners.begin(); l != mSerializeListeners.end(); ++l) + if (*l != NULL) + (*l)->preElementSerialize(this, NewElement); - serializeElementEndImpl(currentNode, currentData, parentData); + void* pElementData = elementsDataList.front(); - for (std::set<SerializeListener*>::iterator l = mSerializeListeners.begin(); l != mSerializeListeners.end(); ++l) - if (*l != NULL) - (*l)->postElementSerialize(this, currentNode); + serializeElementImpl( NewElement, parentElement, pElementData, counter++); - return currentData; + for (XmlNodeProcessorVector::iterator i = mNodeProcessorVector.begin(); i != mNodeProcessorVector.end(); ++i) + serializeChildren(*i, NewElement, pElementData); + + if (mDefaultProcessor != NULL) + serializeChildren( XmlNodeProcessorVectorItem(mDefaultProcessor, ""), NewElement, pElementData ); + + serializeElementEndImpl( NewElement, pParentData, pElementData); + + //! End listeners + for (std::set<SerializeListener*>::iterator l = mSerializeListeners.begin(); l != mSerializeListeners.end(); ++l) + if (*l != NULL) + (*l)->postElementSerialize(this, NewElement ); + + elementsDataList.pop_front(); + + parentElement.InsertEndChild( NewElement ); + } + + } + return bResult; } - void* XmlNodeProcessor::serializeComment(bool& hasSiblingsToSerialize, TiXmlComment& currentNode, void* parentData, size_t counter) + void* XmlNodeProcessor::serializeComment( TiXmlComment& currentNode, void* parentData ) { for (std::set<SerializeListener*>::iterator l = mSerializeListeners.begin(); l != mSerializeListeners.end(); ++l) if (*l != NULL) (*l)->preCommentSerialize(this, currentNode); - void* currentData = serializeCommentImpl(hasSiblingsToSerialize, currentNode, parentData, counter); + void* currentData = serializeCommentImpl( currentNode, parentData ); for (std::set<SerializeListener*>::iterator l = mSerializeListeners.begin(); l != mSerializeListeners.end(); ++l) if (*l != NULL) @@ -400,13 +433,13 @@ return currentData; } - void* XmlNodeProcessor::serializeText(bool& hasSiblingsToSerialize, TiXmlText& currentNode, void* parentData, size_t counter) + void* XmlNodeProcessor::serializeText( TiXmlText& currentNode, void* parentData ) { for (std::set<SerializeListener*>::iterator l = mSerializeListeners.begin(); l != mSerializeListeners.end(); ++l) if (*l != NULL) (*l)->preTextSerialize(this, currentNode); - void* currentData = serializeTextImpl(hasSiblingsToSerialize, currentNode, parentData, counter); + void* currentData = serializeTextImpl( currentNode, parentData ); for (std::set<SerializeListener*>::iterator l = mSerializeListeners.begin(); l != mSerializeListeners.end(); ++l) if (*l != NULL) @@ -415,14 +448,9 @@ return currentData; } - void* XmlNodeProcessor::serializeRootElement(TiXmlDocument& document, std::string elementName, void* data) + bool XmlNodeProcessor::serializeRootElement( std::string elementName, TiXmlDocument& document, void* data) { - TiXmlElement childElement(elementName.c_str()); - bool hasSiblingsToSerialize = false; - void* currentData = serializeElement(hasSiblingsToSerialize, childElement, data, 0); - document.InsertEndChild(childElement); - - return currentData; + return serializeElement( elementName.c_str(), (TiXmlElement&)document, data ); } void XmlNodeProcessor::addParseListener(ParseListener* l) Modified: trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPXmlNodeProcessor.h =================================================================== --- trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPXmlNodeProcessor.h 2011-09-08 00:03:46 UTC (rev 2986) +++ trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPXmlNodeProcessor.h 2013-09-13 09:28:46 UTC (rev 2987) @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Theory: Balazs Hajdics, Tibor Tihon -Author: Tibor Tihon (tib...@gm...), Balazs Hajdics (wol...@fr...) +Author: Tibor Tihon (tib...@gm...), Balazs Hajdics (wol...@fr...), James Le Cuirot, Ihor Tregubov Copyright (C) 2007 Tibor Tihon, Balazs Hajdics @@ -262,127 +262,142 @@ void* getParsedNode(); - // -= Serialization =- - + //!==================================Serialization================================ protected: - void serializeChildren(const XmlNodeProcessorVectorItem& item, TiXmlElement& currentNode, void* currentData); - public: - /// \brief This function tells the parent processor whether any nodes should be - /// created for the specific processor. + /// \brief Serializes children of current node. /// - /// @returns True when a first node is created according to the type and name - /// the processor is registered to. - virtual bool hasNodesToSerialize(void* parentData) { return true; } + /// @param + /// item + /// Refrence on current element. + /// @param + /// parentElement + /// Refrence on parent element. + /// @param + /// parentData + /// Data of the parent. + /// + void serializeChildren(const XmlNodeProcessorVectorItem& item, TiXmlElement& parentElement, void* pParentData ); - /// \brief Serializes data to an XML element. It does administration tasks, calls - /// the overrideable serializeElementImpl() function, and creates one or - /// more child nodes to all the registered processors - for which - /// hasNodesToSerialize() returns true - in the order they were registered. + public: + /// \brief List of elements to serialize + /// BeginImpl function enumerates all children and fills this list. + typedef std::list<void*> ElementsDataList; + + /// \brief Serializes data to an XML element. + /// It calls the serializeElementBeginImpl() function. + /// then serializeElementImpl() function for each element + /// then serializeChildren() for children + /// and finally serializeElementEndImpl to finalize and clear /// /// @param - /// hasSiblingsToSerialize - /// Marks if another element with the same name should be created post - /// the function. + /// strElementName + /// Name of parent element /// @param - /// currentNode - /// The created XML element. + /// parentElement + /// Refrence to parent element. For reverse calls. /// @param /// parentData - /// The system can't tell what part of an object should be serialized - /// so the parent object is given to this function. - /// @param - /// counter - /// Tells how many times this function was called for the same kind of - /// element. + /// Data of the parent. /// - /// @returns Pointer to the data the function serialized. - void* serializeElement(bool& hasSiblingsToSerialize, TiXmlElement& currentNode, void* parentData, size_t counter); + bool serializeElement( const char* strElementName, TiXmlElement& parentElement, void* parentData ); protected: - /// \brief Serializes data to an XML element. It does administration tasks, calls - /// the overrideable serializeElementImpl() function, and creates one or - /// more child nodes to all the registered processors - for which - /// hasNodesToSerialize() returns true - in the order they were registered. + /// \brief Serializes data to an XML element. /// /// @param - /// hasSiblingsToSerialize - /// Marks if another element with the same name should be created post - /// the function. In every call it's false by default, you have to - /// change it to true if there are other elements with the same name to - /// be created. - /// @param /// currentNode - /// The created XML element, automatically named post the name the - /// processor was registered in the parent processor. You can give the - /// attributes in this function. + /// New TiXmlElement was created to for data. + /// /// @param - /// parentData - /// The system can't tell what part of an object should be serialized - /// so the parent object is given to this function. + /// parentNode + /// Refrence for parent TiXmlElement. + /// /// @param + /// pElementData + /// Pointer for current element data. + /// + /// @param /// counter /// Tells how many times this function was called for the same kind of /// element. /// - /// @returns It should return a pointer to the data the function serialized. - virtual void* serializeElementImpl(bool& hasSiblingsToSerialize, TiXmlElement& currentNode, void* parentData, size_t counter) { return NULL; } + virtual void serializeElementImpl( TiXmlElement& currentNode, TiXmlElement& parentNode, void* pElementData, size_t counter) {} + /// \brief Gets called back before element serializetion and forms data set for current element. + /// This enumerates all elements that are to be serialized + /// @param + /// strParentName + /// Parent name. Used to choose the source of data. + /// + /// @param + /// parentData + /// Data of the parent element. + /// @param + /// elementsData + /// List of siblings elements to be serialied. + /// If an elements data is created here, it must be deleted at serializeElementEndImpl + /// + /// @returns If there is at least one element to serialize. + virtual bool serializeElementBeginImpl( const char* strParentName, void* parentData, XmlNodeProcessor::ElementsDataList* elementsData ){ return false; } + /// \brief Gets called back post all the children XML nodes have been created for the /// element. /// /// @param /// currentNode - /// The same XML element that serializeElementImpl() got as an argument. + /// Current node reftence. For data finalization. /// @param - /// currentData + /// parentData /// Pointer to the data which was serialized for the element. /// @param - /// parentData + /// currentData /// The system can't tell what part of an object should be serialized /// so the parent object is given to this function. - virtual void serializeElementEndImpl(TiXmlElement& currentNode, void* currentData, void* parentData) {} + virtual void serializeElementEndImpl(TiXmlElement& currentNode, void* parentData, void* currentData ){} public: /// \brief Serializes data to an XML comment. /// /// @note See serializeElement() for more information. - void* serializeComment(bool& hasSiblingsToSerialize, TiXmlComment& currentNode, void* parentData, size_t counter); + void* serializeComment( TiXmlComment& currentNode, void* parentData ); protected: /// \brief Overrideable function to serialize data to an XML comment. /// /// @note See serializeElementImpl() for more information. - virtual void* serializeCommentImpl(bool& hasSiblingsToSerialize, TiXmlComment& currentNode, void* parentData, size_t counter) { return NULL; } + virtual void* serializeCommentImpl( TiXmlComment& currentNode, void* parentData ) { return NULL; } public: /// \brief Serializes data to an XML comment. /// /// @note See serializeElement() for more information. - void* serializeText(bool& hasSiblingsToSerialize, TiXmlText& currentNode, void* parentData, size_t counter); + void* serializeText( TiXmlText& currentNode, void* parentData ); protected: /// \brief Overrideable function to serialize data to an XML text. /// /// @note See serializeElementImpl() for more information. - virtual void* serializeTextImpl(bool& hasSiblingsToSerialize, TiXmlText& currentNode, void* parentData, size_t counter) { return NULL; } + virtual void* serializeTextImpl( TiXmlText& currentNode, void* parentData ) { return NULL; } public: /// \brief The entry point for serializing a document. /// /// @param - /// document - /// Pointer to the XML document. - /// @param - /// elementName + /// strRootElementName /// Name of the root element. (It's needed because it is not registered /// to any processors.) + /// /// @param + /// document + /// Newly created document for saving. + + /// @param /// data /// Pointer to the data to be serialized. /// @note This function gets the pointer to the serializeable data, not /// to its parent! - void* serializeRootElement(TiXmlDocument& document, std::string elementName, void* data); + bool serializeRootElement( std::string strRootElementName, TiXmlDocument& document, void* data); // -= Event listeners =- Modified: trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPXmlNodeProcessorTreeBuilder.cpp =================================================================== --- trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPXmlNodeProcessorTreeBuilder.cpp 2011-09-08 00:03:46 UTC (rev 2986) +++ trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPXmlNodeProcessorTreeBuilder.cpp 2013-09-13 09:28:46 UTC (rev 2987) @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Theory: Balazs Hajdics -Author: David Vizi (tib...@gm...), Balazs Hajdics (wol...@fr...) +Author: David Vizi (tib...@gm...), Balazs Hajdics (wol...@fr...), James Le Cuirot Copyright (C) 2007 David Vizi, Balazs Hajdics @@ -58,6 +58,7 @@ mProcessors[i]->removeParseListener(pListener); } + void XmlNodeProcessorTreeBuilder::registerElementProcessor(const String& name, XmlNodeProcessor *pParent, XmlNodeProcessor *pChild) { XmlNodeProcessorTreeBuilder::ProcessorVector& namedVector = mNamesToProcessorsMap[name]; @@ -71,6 +72,29 @@ mProcessors.push_back(pChild); } +void XmlNodeProcessorTreeBuilder::unregisterElementProcessor(const String& name) +{ + XmlNodeProcessorTreeBuilder::ProcessorVector& namedVector = mNamesToProcessorsMap[name]; + for (XmlNodeProcessorTreeBuilder::ProcessorVector::iterator it = namedVector.begin(); it != namedVector.end(); it++) + { + XmlNodeProcessorTreeBuilder::ProcessorVector& parents = mChildrenToParentsMap[*it]; + for (XmlNodeProcessorTreeBuilder::ProcessorVector::iterator parentIt = parents.begin(); parentIt != parents.end(); parentIt++) + { + (*parentIt)->removeElementProcessor(name); + } + } + namedVector.clear(); +} + +void XmlNodeProcessorTreeBuilder::unregisterElementProcessors(const StringVector& tags) +{ + for (StringVector::const_iterator it = tags.begin(); it != tags.end(); it++) + { + unregisterElementProcessor(*it); + } +} + + void XmlNodeProcessorTreeBuilder::registerRootProcessor(const String& name, XmlNodeProcessor* pRoot) { mRoot = pRoot; Modified: trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPXmlNodeProcessorTreeBuilder.h =================================================================== --- trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPXmlNodeProcessorTreeBuilder.h 2011-09-08 00:03:46 UTC (rev 2986) +++ trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XNPXmlNodeProcessorTreeBuilder.h 2013-09-13 09:28:46 UTC (rev 2987) @@ -1,6 +1,6 @@ /* ----------------------------------------------------------------------------- -Author: Balazs Hajdics (wol...@fr...) +Author: Balazs Hajdics (wol...@fr...), James Le Cuirot Copyright (C) 2007 Balazs Hajdics @@ -57,7 +57,7 @@ public: - XmlNodeProcessorTreeBuilder::XmlNodeProcessorTreeBuilder(CommonParamsOfXmlNodeProcessors* commonParams): + XmlNodeProcessorTreeBuilder(CommonParamsOfXmlNodeProcessors* commonParams): mCommonParamsOfXmlNodeProcessors(commonParams), mRoot(0) { @@ -104,8 +104,12 @@ virtual void addParseListener(XmlNodeProcessor::ParseListener *pListener); virtual void removeParseListener(XmlNodeProcessor::ParseListener *pListener); + void unregisterElementProcessors(const StringVector& tags); + void unregisterElementProcessor(const String& name); + protected: void registerElementProcessor(const String& name, XmlNodeProcessor* pParent, XmlNodeProcessor* pChild); + void registerRootProcessor(const String& name, XmlNodeProcessor* pRoot); protected: Added: trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XmlNodeProcessor.vcxproj =================================================================== --- trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XmlNodeProcessor.vcxproj (rev 0) +++ trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XmlNodeProcessor.vcxproj 2013-09-13 09:28:46 UTC (rev 2987) @@ -0,0 +1,284 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug - DLL|Win32"> + <Configuration>Debug - DLL</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug - LIB|Win32"> + <Configuration>Debug - LIB</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release - DLL|Win32"> + <Configuration>Release - DLL</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release - LIB|Win32"> + <Configuration>Release - LIB</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{D8F6326C-8019-4cc3-8D66-D262A788D14F}</ProjectGuid> + <RootNamespace>XmlNodeProcessor</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - DLL|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - LIB|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <CLRSupport>false</CLRSupport> + <WholeProgramOptimization>true</WholeProgramOptimization> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - DLL|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - LIB|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release - DLL|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release - LIB|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - DLL|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - LIB|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\Bin\Release\trunk\main\Executables\Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Bin\Release\trunk\main\Executables\Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - LIB|Win32'">..\..\..\..\..\Bin\Release\trunk\main\Executables\Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - LIB|Win32'">$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - DLL|Win32'">..\..\..\..\..\Bin\Release\trunk\main\Executables\Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - DLL|Win32'">$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug - DLL|Win32'">true</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - LIB|Win32'">..\..\..\..\..\Bin\Release\trunk\main\Executables\Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - LIB|Win32'">$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - DLL|Win32'">..\..\..\..\..\Bin\Release\trunk\main\Executables\Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - DLL|Win32'">$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release - DLL|Win32'">false</LinkIncremental> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug - DLL|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug - DLL|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug - DLL|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug - LIB|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug - LIB|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug - LIB|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release - DLL|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release - DLL|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release - DLL|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release - LIB|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release - LIB|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release - LIB|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\..\..\Dependencies\trunk\main\Tinyxml\includes;..\..\..\..\Dependencies\trunk\main\OGRE\includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;XMLNODEPROCESSING_BUILDMODE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + </ClCompile> + <Link> + <AdditionalDependencies>tinyxml_d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalLibraryDirectories>..\..\..\..\Dependencies\trunk\main\Tinyxml\lib;../../../../../../Dependencies/trunk/main/Ogre/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <AdditionalIncludeDirectories>..\..\..\..\Dependencies\trunk\main\Tinyxml\includes;..\..\..\..\Dependencies\trunk\main\OGRE\includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;XMLNODEPROCESSING_BUILDMODE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <RuntimeTypeInfo>false</RuntimeTypeInfo> + <PrecompiledHeader> + </PrecompiledHeader> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Link> + <AdditionalDependencies>tinyxml.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalLibraryDirectories>..\..\..\..\Dependencies\trunk\main\Tinyxml\lib;../../../../../../Dependencies/trunk/main/Ogre/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - LIB|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\..\..\Dependencies\trunk\main\Tinyxml\includes;..\..\..\..\Dependencies\trunk\main\OGRE\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;XMLNODEPROCESSING_BUILDMODE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <RuntimeTypeInfo>false</RuntimeTypeInfo> + <PrecompiledHeader> + </PrecompiledHeader> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + </ClCompile> + <Lib> + <OutputFile>$(OutDir)$(ProjectName)_d.lib</OutputFile> + </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - DLL|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\..\..\Dependencies\trunk\main\Tinyxml\includes;..\..\..\..\Dependencies\trunk\main\OGRE\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;XMLNODEPROCESSING_BUILDMODE_DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + </ClCompile> + <Link> + <AdditionalDependencies>tinyxml_d.lib;OgreMain_d.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(ProjectName)_d.dll</OutputFile> + <AdditionalLibraryDirectories>..\..\..\..\Dependencies\trunk\main\Tinyxml\lib;../../../../../../Dependencies/trunk/main/Ogre/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - LIB|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <InlineFunctionExpansion>Default</InlineFunctionExpansion> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> + <OmitFramePointers>true</OmitFramePointers> + <WholeProgramOptimization>true</WholeProgramOptimization> + <AdditionalIncludeDirectories>..\..\..\..\Dependencies\trunk\main\Tinyxml\includes;..\..\..\..\Dependencies\trunk\main\OGRE\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;XMLNODEPROCESSING_BUILDMODE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>false</MinimalRebuild> + <BasicRuntimeChecks>Default</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <RuntimeTypeInfo>false</RuntimeTypeInfo> + <PrecompiledHeader> + </PrecompiledHeader> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Lib> + <AdditionalOptions>/NODEFAULTLIB:MSVCRTD /VERBOSE:LIB %(AdditionalOptions)</AdditionalOptions> + <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile> + </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - DLL|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <InlineFunctionExpansion>Default</InlineFunctionExpansion> + <IntrinsicFunctions>false</IntrinsicFunctions> + <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> + <OmitFramePointers>false</OmitFramePointers> + <AdditionalIncludeDirectories>..\..\..\..\Dependencies\trunk\main\Tinyxml\includes;..\..\..\..\Dependencies\trunk\main\OGRE\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;XMLNODEPROCESSING_BUILDMODE_DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>false</MinimalRebuild> + <BasicRuntimeChecks>Default</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <RuntimeTypeInfo>false</RuntimeTypeInfo> + <PrecompiledHeader> + </PrecompiledHeader> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Link> + <AdditionalDependencies>tinyxml.lib;OgreMain.lib;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile> + <AdditionalLibraryDirectories>..\..\..\..\Dependencies\trunk\main\Tinyxml\lib;../../../../../../Dependencies/trunk/main/Ogre/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="XNPCommonParamsOfXmlNodeProcessors.h" /> + <ClInclude Include="XNPPrerequisites.h" /> + <ClInclude Include="XNPXmlNodeProcessor.h" /> + <ClInclude Include="XNPXmlNodeProcessorTreeBuilder.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="XNPCommonParamsOfXmlNodeProcessors.cpp" /> + <ClCompile Include="XNPDemo.cpp" /> + <ClCompile Include="XNPXmlNodeProcessor.cpp" /> + <ClCompile Include="XNPXmlNodeProcessorTreeBuilder.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\..\..\Dependencies\trunk\main\Tinyxml\tinyxml.vcxproj"> + <Project>{b0c9c6cb-ec75-4f7c-8b35-2f6cb0fc4e0f}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XmlNodeProcessor.vcxproj.filters =================================================================== --- trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XmlNodeProcessor.vcxproj.filters (rev 0) +++ trunk/dotsceneformat/Source/Common/trunk/main/XmlNodeProcessor/XmlNodeProcessor.vcxproj.filters 2013-09-13 09:28:46 UTC (rev 2987) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Header Files"> + <UniqueIdentifier>{d567ebe9-bdfa-43ab-ad38-378166744d87}</UniqueIdentifier> + <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> + </Filter> + <Filter Include="Source Files"> + <UniqueIdentifier>{32a58f19-b546-40b7-8fc2-c534c0ff4fba}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClInclude Include="XNPCommonParamsOfXmlNodeProcessors.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="XNPPrerequisites.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="XNPXmlNodeProcessor.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="XNPXmlNodeProcessorTreeBuilder.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClCompile Include="XNPCommonParamsOfXmlNodeProcessors.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="XNPDemo.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="XNPXmlNodeProcessor.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="XNPXmlNodeProcessorTreeBuilder.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> +</Project> \ No newline at end of file Added: trunk/dotsceneformat/Source/Dependencies/trunk/main/HDRLib/HDRLib.vcxproj =================================================================== --- trunk/dotsceneformat/Source/Dependencies/trunk/main/HDRLib/HDRLib.vcxproj (rev 0) +++ trunk/dotsceneformat/Source/Dependencies/trunk/main/HDRLib/HDRLib.vcxproj 2013-09-13 09:28:46 UTC (rev 2987) @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{5B2FC2A2-8C2D-4F38-896C-B67E14B3205F}</ProjectGuid> + <RootNamespace>HDRLib</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./lib\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./lib\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> + <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>includes;../Ogre/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + </ClCompile> + <Lib> + <OutputFile>$(OutDir)$(ProjectName)_d.lib</OutputFile> + </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <AdditionalIncludeDirectories>includes;../Ogre/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="src\HDRCompositor.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="includes\HDRCompositor.h" /> + </ItemGroup> + <ItemGroup> + <None Include="ReadMe.txt" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline... [truncated message content] |
From: <sf...@us...> - 2011-09-08 00:03:53
|
Revision: 2986 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2986&view=rev Author: sfcbias Date: 2011-09-08 00:03:46 +0000 (Thu, 08 Sep 2011) Log Message: ----------- Modified Paths: -------------- branches/ogrenewt/newton20/.cproject branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp branches/ogrenewt/newton20/src/OgreNewt_CollisionSerializer.cpp Modified: branches/ogrenewt/newton20/.cproject =================================================================== --- branches/ogrenewt/newton20/.cproject 2011-08-22 01:45:12 UTC (rev 2985) +++ branches/ogrenewt/newton20/.cproject 2011-09-08 00:03:46 UTC (rev 2986) @@ -47,8 +47,16 @@ <tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.289230271" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/> <tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1825451809" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug"> <option id="gnu.cpp.link.option.libs.965630787" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs"> +<listOptionValue builtIn="false" value="OgreMain"/> +<listOptionValue builtIn="false" value="OgreTerrain"/> <listOptionValue builtIn="false" value="Newton"/> +<listOptionValue builtIn="false" value="dJointLibrary"/> +<listOptionValue builtIn="false" value="dContainers"/> +<listOptionValue builtIn="false" value="dMath"/> </option> +<option id="gnu.cpp.link.option.paths.1238797954" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths"> +<listOptionValue builtIn="false" value="/home/bryce/Dev/newton-dynamics-2.33/packages/linux64"/> +</option> <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1233710170" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input"> <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> <additionalInput kind="additionalinput" paths="$(LIBS)"/> @@ -60,7 +68,7 @@ </toolChain> </folderInfo> <sourceEntries> -<entry excluding="demos" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> +<entry excluding="Test.cpp|demos" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> @@ -525,7 +533,7 @@ </toolChain> </folderInfo> <sourceEntries> -<entry excluding="demos" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> +<entry excluding="Test.cpp|demos" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> </sourceEntries> </configuration> </storageModule> Modified: branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp =================================================================== --- branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp 2011-08-22 01:45:12 UTC (rev 2985) +++ branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp 2011-09-08 00:03:46 UTC (rev 2986) @@ -307,7 +307,7 @@ bool optimize, int id, FaceWinding fw) : Collision(world) { - Ogre::Vector3 scale; + Ogre::Vector3 scale(1.0f,1.0f,1.0f); start(id); Modified: branches/ogrenewt/newton20/src/OgreNewt_CollisionSerializer.cpp =================================================================== --- branches/ogrenewt/newton20/src/OgreNewt_CollisionSerializer.cpp 2011-08-22 01:45:12 UTC (rev 2985) +++ branches/ogrenewt/newton20/src/OgreNewt_CollisionSerializer.cpp 2011-09-08 00:03:46 UTC (rev 2986) @@ -31,7 +31,7 @@ collision->m_col, &CollisionSerializer::_newtonSerializeCallback, this); - fclose( mpfFile); + fclose(mpfFile); } //CollisionPtr CollisionSerializer::importCollision(Ogre::DataStreamPtr& stream, OgreNewt::World* world) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sf...@us...> - 2011-08-22 01:45:20
|
Revision: 2985 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2985&view=rev Author: sfcbias Date: 2011-08-22 01:45:12 +0000 (Mon, 22 Aug 2011) Log Message: ----------- Modified Paths: -------------- branches/ogrenewt/newton20/inc/OgreNewt_Body.h branches/ogrenewt/newton20/inc/OgreNewt_BodyInAABBIterator.h branches/ogrenewt/newton20/inc/OgreNewt_Collision.h branches/ogrenewt/newton20/inc/OgreNewt_CollisionPrimitives.h branches/ogrenewt/newton20/inc/OgreNewt_CollisionSerializer.h branches/ogrenewt/newton20/inc/OgreNewt_Prerequisites.h branches/ogrenewt/newton20/inc/OgreNewt_World.h branches/ogrenewt/newton20/inc/OgreNewt_stdafx.h branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp branches/ogrenewt/newton20/src/OgreNewt_CollisionSerializer.cpp branches/ogrenewt/newton20/src/OgreNewt_Joint.cpp Modified: branches/ogrenewt/newton20/inc/OgreNewt_Body.h =================================================================== --- branches/ogrenewt/newton20/inc/OgreNewt_Body.h 2011-07-22 03:27:15 UTC (rev 2984) +++ branches/ogrenewt/newton20/inc/OgreNewt_Body.h 2011-08-22 01:45:12 UTC (rev 2985) @@ -44,9 +44,9 @@ gravity, etc. You can set this as the custom force callback for a body by using the setCustomForceCallback() function. - Using boost::function means OgreNewt can now accept pointers to member functions of specific classes. + Using OgreNewt::function means OgreNewt can now accept pointers to member functions of specific classes. */ - typedef boost::function<void(OgreNewt::Body*, float timeStep, int threadIndex)> ForceCallback; + typedef OgreNewt::function<void(OgreNewt::Body*, float timeStep, int threadIndex)> ForceCallback; //! node update notify. @@ -56,9 +56,9 @@ The application can use this function to re calculate relative position of child nodes, or any other depended transform. You can set this as the by using the setnNodeUpdateNotify() function. - Using boost::function means OgreNewt can now accept pointers to member functions of specific classes. + Using OgreNewt::function means OgreNewt can now accept pointers to member functions of specific classes. */ - typedef boost::function<void(OgreNewt::Body*)> NodeUpdateNotifyCallback; + typedef OgreNewt::function<void(OgreNewt::Body*)> NodeUpdateNotifyCallback; #if 0 @@ -70,8 +70,8 @@ create your own for special cases. you are passed a quaternion (orientation) and vector (position) of the rigid body in world space. */ - //typedef boost::function<void(OgreNewt::Body*, const Ogre::Quaternion&, const Ogre::Vector3&, int threadIndex)> TransformCallback; - //typedef boost::function<void(OgreNewt::Body*, int threadIndex)> TransformCallback; + //typedef OgreNewt::function<void(OgreNewt::Body*, const Ogre::Quaternion&, const Ogre::Vector3&, int threadIndex)> TransformCallback; + //typedef OgreNewt::function<void(OgreNewt::Body*, int threadIndex)> TransformCallback; #endif @@ -84,7 +84,7 @@ ignore buoyancy for this collision primitive, just return false from the function. otherwise, fill the "retPlane" with your liquid surface plane, and return true to apply buoyancy to the primitive. */ - typedef boost::function<bool(int, OgreNewt::Body*, const Ogre::Quaternion&, const Ogre::Vector3&, Ogre::Plane&)> buoyancyPlaneCallback; + typedef OgreNewt::function<bool(int, OgreNewt::Body*, const Ogre::Quaternion&, const Ogre::Vector3&, Ogre::Plane&)> buoyancyPlaneCallback; //! constructor. /*! @@ -159,9 +159,9 @@ This specifies a custom callback to use for applying forces to a body. if you are using a standard non-member function, or a static member function, you can simply pass a pointer to the function here.. like this: setCustomForceAndTorqueCallback( &myCallbackFunction ); - If you want to bind to a class member, you also need to pass a pointer to the class itself, using the boost::bind system, like so: - setCustomForceAndTorqueCallback( boost::bind( &MyClass::myCallback, (MyClass*)classInstance, _1 ) ); (from outside the class) or: - setCustomForceAndTorqueCallback( boost::bind( &MyClass::myCallback, this, _1 ) ); (from inside the class). + If you want to bind to a class member, you also need to pass a pointer to the class itself, using the OgreNewt::bind system, like so: + setCustomForceAndTorqueCallback( OgreNewt::bind( &MyClass::myCallback, (MyClass*)classInstance, _1 ) ); (from outside the class) or: + setCustomForceAndTorqueCallback( OgreNewt::bind( &MyClass::myCallback, this, _1 ) ); (from inside the class). You can also use: setCustomForceAndTorqueCallback<>( &MyClass::myCallback, (MyClass*)classInstance ); (from outside the class) or: @@ -169,9 +169,9 @@ Note: Notice the "<>" after the function name. */ void setCustomForceAndTorqueCallback( ForceCallback callback ); - template<class c> void setCustomForceAndTorqueCallback( boost::function<void(c*, Body*, float, int)> callback, c *instancedClassPointer ) + template<class c> void setCustomForceAndTorqueCallback( OgreNewt::function<void(c*, Body*, float, int)> callback, c *instancedClassPointer ) { - setCustomForceAndTorqueCallback( boost::bind(callback, instancedClassPointer, _1, _2, _3) ); + setCustomForceAndTorqueCallback( OgreNewt::bind(callback, instancedClassPointer, _1, _2, _3) ); } //! remove any force callbacks. @@ -190,9 +190,9 @@ Control joints like the vehicle an drag dolls use the function to calculate the correct matrix of wheels and body parts. */ void setNodeUpdateNotify (NodeUpdateNotifyCallback callback ); - template<class c> void setNodeUpdateNotify (boost::function<void(c*, OgreNewt::Body*)> callback, c *instancedClassPointer ) + template<class c> void setNodeUpdateNotify (OgreNewt::function<void(c*, OgreNewt::Body*)> callback, c *instancedClassPointer ) { - setNodeUpdateNotify( boost::bind(callback, instancedClassPointer, _1) ); + setNodeUpdateNotify( OgreNewt::bind(callback, instancedClassPointer, _1) ); } //! remove any transform callbacks. @@ -422,9 +422,9 @@ \param buoyancyPlaneCallback user function that returns the plane equation for the fluid at the current location. pass NULL to assume the body is fully immersed in fluid. see the setCustomForceAndTorqueCallback() docs to info on how to bind class member functions. */ void addBouyancyForce( Ogre::Real fluidDensity, Ogre::Real fluidLinearViscosity , Ogre::Real fluidAngularViscosity , const Ogre::Vector3& gravity, buoyancyPlaneCallback callback ); - template<class c> void addBouyancyForce( Ogre::Real fluidDensity, Ogre::Real fluidLinearViscosity , Ogre::Real fluidAngularViscosity , const Ogre::Vector3& gravity, boost::function<bool(c*, int, Body*, const Ogre::Quaternion&, const Ogre::Vector3&, Ogre::Plane&)> callback, c *instancedClassPointer ) + template<class c> void addBouyancyForce( Ogre::Real fluidDensity, Ogre::Real fluidLinearViscosity , Ogre::Real fluidAngularViscosity , const Ogre::Vector3& gravity, OgreNewt::function<bool(c*, int, Body*, const Ogre::Quaternion&, const Ogre::Vector3&, Ogre::Plane&)> callback, c *instancedClassPointer ) { - addBouyancyForce( fluidDensity, fluidLinearViscosity, fluidAngularViscosity, gravity, boost::bind(callback, instancedClassPointer, _1, _2, _3, _4, _5) ); + addBouyancyForce( fluidDensity, fluidLinearViscosity, fluidAngularViscosity, gravity, OgreNewt::bind(callback, instancedClassPointer, _1, _2, _3, _4, _5) ); } Modified: branches/ogrenewt/newton20/inc/OgreNewt_BodyInAABBIterator.h =================================================================== --- branches/ogrenewt/newton20/inc/OgreNewt_BodyInAABBIterator.h 2011-07-22 03:27:15 UTC (rev 2984) +++ branches/ogrenewt/newton20/inc/OgreNewt_BodyInAABBIterator.h 2011-08-22 01:45:12 UTC (rev 2985) @@ -34,7 +34,7 @@ /*! This function will be called for every body iterated. you can put any functionality you might want inside this function. */ - typedef boost::function<void(const Body*, void* userdata)> IteratorCallback; + typedef OgreNewt::function<void(const Body*, void* userdata)> IteratorCallback; //! perform an iteration /*! @@ -43,9 +43,9 @@ \warning you cannot call this functions from different threads at the same time */ void go( const Ogre::AxisAlignedBox &aabb, IteratorCallback callback, void* userdata) const; - template <class c> void go( const Ogre::AxisAlignedBox &aabb, boost::function<void(c*, Body*)> callback, c* instancedClassPointer ) const + template <class c> void go( const Ogre::AxisAlignedBox &aabb, OgreNewt::function<void(c*, Body*)> callback, c* instancedClassPointer ) const { - go ( aabb, boost::bind(callback, instancedClassPointer, _1) ); + go ( aabb, OgreNewt::bind(callback, instancedClassPointer, _1) ); } protected: Modified: branches/ogrenewt/newton20/inc/OgreNewt_Collision.h =================================================================== --- branches/ogrenewt/newton20/inc/OgreNewt_Collision.h 2011-07-22 03:27:15 UTC (rev 2984) +++ branches/ogrenewt/newton20/inc/OgreNewt_Collision.h 2011-08-22 01:45:12 UTC (rev 2985) @@ -160,8 +160,8 @@ typedef Collision* CollisionPtr; typedef ConvexCollision* ConvexCollisionPtr; #else -typedef boost::shared_ptr<Collision> CollisionPtr; -typedef boost::shared_ptr<ConvexCollision> ConvexCollisionPtr; +typedef OgreNewt::shared_ptr<Collision> CollisionPtr; +typedef OgreNewt::shared_ptr<ConvexCollision> ConvexCollisionPtr; #endif Modified: branches/ogrenewt/newton20/inc/OgreNewt_CollisionPrimitives.h =================================================================== --- branches/ogrenewt/newton20/inc/OgreNewt_CollisionPrimitives.h 2011-07-22 03:27:15 UTC (rev 2984) +++ branches/ogrenewt/newton20/inc/OgreNewt_CollisionPrimitives.h 2011-08-22 01:45:12 UTC (rev 2985) @@ -63,9 +63,9 @@ \param pos position offset of the primitive */ Box(const World* world, const Ogre::Vector3& size, int id, - const Ogre::Quaternion& orient = - Ogre::Quaternion::IDENTITY, - const Ogre::Vector3& pos = Ogre::Vector3::ZERO); + const Ogre::Quaternion& orient = + Ogre::Quaternion::IDENTITY, + const Ogre::Vector3& pos = Ogre::Vector3::ZERO); //! destructor ~Box() @@ -94,9 +94,9 @@ \param pos position offset of the primitive */ Ellipsoid(const World* world, const Ogre::Vector3& size, - int id, const Ogre::Quaternion& orient = - Ogre::Quaternion::IDENTITY, - const Ogre::Vector3& pos = Ogre::Vector3::ZERO); + int id, const Ogre::Quaternion& orient = + Ogre::Quaternion::IDENTITY, + const Ogre::Vector3& pos = Ogre::Vector3::ZERO); //! destructor ~Ellipsoid() @@ -126,10 +126,10 @@ \param pos position offset of the primitive */ Cylinder(const World* world, Ogre::Real radius, - Ogre::Real height, int id, - const Ogre::Quaternion& orient = - Ogre::Quaternion::IDENTITY, - const Ogre::Vector3& pos = Ogre::Vector3::ZERO); + Ogre::Real height, int id, + const Ogre::Quaternion& orient = + Ogre::Quaternion::IDENTITY, + const Ogre::Vector3& pos = Ogre::Vector3::ZERO); //! destructor ~Cylinder() @@ -159,10 +159,10 @@ \param pos position offset of the primitive */ Capsule(const World* world, Ogre::Real radius, - Ogre::Real height, int id, - const Ogre::Quaternion& orient = - Ogre::Quaternion::IDENTITY, - const Ogre::Vector3& pos = Ogre::Vector3::ZERO); + Ogre::Real height, int id, + const Ogre::Quaternion& orient = + Ogre::Quaternion::IDENTITY, + const Ogre::Vector3& pos = Ogre::Vector3::ZERO); //! destructor ~Capsule() @@ -192,9 +192,9 @@ \param pos position offset of the primitive */ Cone(const World* world, Ogre::Real radius, Ogre::Real height, - int id, const Ogre::Quaternion& orient = - Ogre::Quaternion::IDENTITY, - const Ogre::Vector3& pos = Ogre::Vector3::ZERO); + int id, const Ogre::Quaternion& orient = + Ogre::Quaternion::IDENTITY, + const Ogre::Vector3& pos = Ogre::Vector3::ZERO); //! destructor ~Cone() @@ -224,10 +224,10 @@ \param pos position offset of the primitive */ ChamferCylinder(const World* world, Ogre::Real radius, - Ogre::Real height, int id, - const Ogre::Quaternion& orient = - Ogre::Quaternion::IDENTITY, - const Ogre::Vector3& pos = Ogre::Vector3::ZERO); + Ogre::Real height, int id, + const Ogre::Quaternion& orient = + Ogre::Quaternion::IDENTITY, + const Ogre::Vector3& pos = Ogre::Vector3::ZERO); //! destructor ~ChamferCylinder() @@ -262,11 +262,11 @@ \param forceScale if set to something else then (0,0,0), the value of this argument will be used as scale instead of the parent-node's scale */ ConvexHull(const World* world, Ogre::Entity* ent, int id = 1, - const Ogre::Quaternion& orient = - Ogre::Quaternion::IDENTITY, - const Ogre::Vector3& pos = Ogre::Vector3::ZERO, - Ogre::Real tolerance = 0.001f, - const Ogre::Vector3& forceScale = Ogre::Vector3::ZERO); + const Ogre::Quaternion& orient = + Ogre::Quaternion::IDENTITY, + const Ogre::Vector3& pos = Ogre::Vector3::ZERO, + Ogre::Real tolerance = 0.001f, + const Ogre::Vector3& forceScale = Ogre::Vector3::ZERO); /*! Overloaded constructor. pass a pointer to an array of vertices and the hull will be made from that. @@ -279,11 +279,11 @@ \param tolerance a tolerance passed to newton */ ConvexHull(const World* world, const Ogre::Vector3* verts, - int vertcount, int id = 1, - const Ogre::Quaternion& orient = - Ogre::Quaternion::IDENTITY, - const Ogre::Vector3& pos = Ogre::Vector3::ZERO, - Ogre::Real tolerance = 0.001f); + int vertcount, int id = 1, + const Ogre::Quaternion& orient = + Ogre::Quaternion::IDENTITY, + const Ogre::Vector3& pos = Ogre::Vector3::ZERO, + Ogre::Real tolerance = 0.001f); //! destructor ~ConvexHull() @@ -314,7 +314,7 @@ \param id an id for this shape, can be received with collision->getUserId() */ TreeCollision(const World* world, Ogre::Entity* ent, - bool optimize, int id, FaceWinding fw = FW_DEFAULT); + bool optimize, int id, FaceWinding fw = FW_DEFAULT); //! constructor /*! @@ -329,9 +329,9 @@ \param id an id for this shape, can be received with collision->getUserId() */ TreeCollision(const World* world, int numVertices, - int numIndices, const float *vertices, - const int *indices, bool optimize, int id, - FaceWinding fw = FW_DEFAULT); + int numIndices, const float *vertices, + const int *indices, bool optimize, int id, + FaceWinding fw = FW_DEFAULT); //! constructor /*! @@ -345,8 +345,8 @@ \param id an id for this shape, can be received with collision->getUserId() */ TreeCollision(const World* world, int numVertices, - Ogre::Vector3* vertices, Ogre::IndexData* indexData, - bool optimize, int id, FaceWinding fw = FW_DEFAULT); + Ogre::Vector3* vertices, Ogre::IndexData* indexData, + bool optimize, int id, FaceWinding fw = FW_DEFAULT); //! destructor virtual ~TreeCollision() @@ -377,13 +377,14 @@ } //! used internally - static float _CDECL newtonRayCastCallback(const NewtonBody* body, - const NewtonCollision* col, float distance, float* normal, - int faceId, void* userData); + static float _CDECL newtonRayCastCallback( + const NewtonBody* body, const NewtonCollision* col, + float distance, float* normal, int faceId, + void* userData); private: static void setRayCastCallbackActive(bool active, - const NewtonCollision *col); + const NewtonCollision *col); }; @@ -407,7 +408,7 @@ //! parse the scene. void parseScene(Ogre::SceneNode* startNode, int id, - bool optimize = true, FaceWinding fw = FW_DEFAULT); + bool optimize = true, FaceWinding fw = FW_DEFAULT); protected: @@ -417,15 +418,15 @@ You can also change the face winding on an entity-by-entity basis by changing the fw variable from within the filter. */ virtual bool entityFilter(const Ogre::SceneNode* currentNode, - const Ogre::Entity* currentEntity, FaceWinding& fw) + const Ogre::Entity* currentEntity, FaceWinding& fw) { return true; } //! user inherit-able function, allows customization of the ID to be assigned to this group of polygons. virtual unsigned int getID(const Ogre::SceneNode* currentNode, - const Ogre::Entity* currentEntity, - unsigned int currentSubMesh) + const Ogre::Entity* currentEntity, + unsigned int currentSubMesh) { return count++; } @@ -433,9 +434,9 @@ private: //! recursive function to parse a single scene node. void _parseNode(Ogre::SceneNode* node, - const Ogre::Quaternion& curOrient, - const Ogre::Vector3& curPos, - const Ogre::Vector3& curScale, FaceWinding fw); + const Ogre::Quaternion& curOrient, + const Ogre::Vector3& curPos, + const Ogre::Vector3& curScale, FaceWinding fw); static int count; }; @@ -463,7 +464,7 @@ \param id an id for this shape, can be received with collision->getUserId() */ CompoundCollision(const World* world, std::vector< - OgreNewt::CollisionPtr> col_array, int id); + OgreNewt::CollisionPtr> col_array, int id); //! destructor ~CompoundCollision() @@ -500,10 +501,10 @@ \param tolerance a tolerance passed to newton */ Pyramid(const World* world, const Ogre::Vector3& size, int id, - const Ogre::Quaternion& orient = - Ogre::Quaternion::IDENTITY, - const Ogre::Vector3& pos = Ogre::Vector3::ZERO, - Ogre::Real tolerance = 0.001f); + const Ogre::Quaternion& orient = + Ogre::Quaternion::IDENTITY, + const Ogre::Vector3& pos = Ogre::Vector3::ZERO, + Ogre::Real tolerance = 0.001f); //! destructor ~Pyramid() @@ -511,27 +512,35 @@ } }; - //! HeightField Collision - /*! - Builds a HeightField collision from raw data or directly from a OgreTerrain page + //! HeightField Collision + /*! + Builds a HeightField collision from raw data or directly from a OgreTerrain page + */ + class _OgreNewtExport HeightField: public OgreNewt::Collision + { + public: + HeightField(const World* world) : + OgreNewt::Collision(world) + { + } - more info: http://newtondynamics.com/wiki/index.php5?title=NewtonCreateHeightFieldCollision - */ - /* Waiting for Ogre 1.7 - class _OgreNewtExport HeightField : public OgreNewt::Collision - { - public: - HeightField(const World* world): OgreNewt::Collision(world){} - HeightField(const World* world, int width, int height, int gridsDiagonals, unsigned short *elevationMap, char *attributeMap, Ogre::Real horizontalScale, Ogre::Real verticleScale, int shapeID); - HeightField(const World* world, Ogre::Terrain *terrain, int shapeID); + HeightField(const World* world, Ogre::Terrain *terrain, + int shapeID); - ~HeightField(){} + ~HeightField() + { + } - private: - //!Used internally to create the newton Heightfield collision - void createHeightFieldCollision(const World *world,int width,int height,int gridsDiagonals,unsigned short *elevationMap,char *attributeMap,Ogre::Real horizontalScale,Ogre::Real verticleScale,int shapeID); - }; - */ + /* + * The heightfield uses a modified body matrix thats calculated at the time of creation + * so its create for you. This is pointer to the body created. + */ + OgreNewt::Body* getBody(){ return mBody; } + + protected: + OgreNewt::Body* mBody; + private: + }; } // end namespace CollisionPrimitives }// end namespace OgreNewt Modified: branches/ogrenewt/newton20/inc/OgreNewt_CollisionSerializer.h =================================================================== --- branches/ogrenewt/newton20/inc/OgreNewt_CollisionSerializer.h 2011-07-22 03:27:15 UTC (rev 2984) +++ branches/ogrenewt/newton20/inc/OgreNewt_CollisionSerializer.h 2011-08-22 01:45:12 UTC (rev 2985) @@ -57,6 +57,8 @@ (Newton calls this function several times for each deserialization, once for each chunk of its file format apparently) */ static void _CDECL _newtonDeserializeCallback(void* deserializeHandle, void* buffer, int size); + + // FILE* mpFile; }; Modified: branches/ogrenewt/newton20/inc/OgreNewt_Prerequisites.h =================================================================== --- branches/ogrenewt/newton20/inc/OgreNewt_Prerequisites.h 2011-07-22 03:27:15 UTC (rev 2984) +++ branches/ogrenewt/newton20/inc/OgreNewt_Prerequisites.h 2011-08-22 01:45:12 UTC (rev 2985) @@ -25,6 +25,7 @@ # include <Ogre/OgreSceneNode.h> # include <Ogre/OgreSceneManager.h> # include <Ogre/OgreManualObject.h> +# include <Ogre/Terrain/OgreTerrain.h> //# include <OgreTerrain.h> # ifndef OGRENEWT_NO_OGRE_ANY # include <Ogre/OgreAny.h> @@ -39,6 +40,7 @@ #include <OgreSceneNode.h> #include <OgreSceneManager.h> #include <OgreManualObject.h> +#include <Terrain/OgreTerrain.h> //#include <OgreTerrain.h> # ifndef OGRENEWT_NO_OGRE_ANY # include <OgreAny.h> @@ -46,12 +48,30 @@ #endif #include <Newton.h> -#include <boost/function.hpp> -#include <boost/bind.hpp> -#ifndef OGRENEWT_NO_COLLISION_SHAREDPTR -# include <boost/shared_ptr.hpp> + +#if defined(OGRENEWT_USE_BOOST) || !defined(WIN32) || !defined(_MSC_VER) || _MSC_VER < 1600 +# define OGRENEWT_IMPORTED_NAMESPACE boost +# include <boost/function.hpp> +# include <boost/bind.hpp> +# ifndef OGRENEWT_NO_COLLISION_SHAREDPTR +# include <boost/shared_ptr.hpp> +# endif +#else +# define OGRENEWT_IMPORTED_NAMESPACE std +# include <functional> #endif +namespace OgreNewt +{ + using OGRENEWT_IMPORTED_NAMESPACE::function; + using OGRENEWT_IMPORTED_NAMESPACE::bind; +# ifndef OGRENEWT_NO_COLLISION_SHAREDPTR + using OGRENEWT_IMPORTED_NAMESPACE::shared_ptr; +# endif +} + +#undef OGRENEWT_IMPORTED_NAMESPACE + #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 # define _CDECL _cdecl # if defined( _OGRENEWT_EXPORTS ) && defined( _OGRENEWT_DYNAMIC ) @@ -108,7 +128,7 @@ * This function is called, when the object is destroyed. It's only argument is a pointer to the instance currently destroyed * @warning the pointer to the destroyed class instance is already invalid (the class is already destroyed!) */ - typedef boost::function<void(DerivedClass*)> DestructorCallbackFunction; + typedef OgreNewt::function<void(DerivedClass*)> DestructorCallbackFunction; //! constructor _DestructorCallback() : m_callback(NULL) {} @@ -130,9 +150,9 @@ * or a static member function, you can simply pass a pointer to the function here.. like this: * setDestructorCallback( &myCallbackFunction ); * - * If you want to bind to a class member, you also need to pass a pointer to the class itself, using the boost::bind system, like so: - * setDestructorCallback( boost::bind( &MyClass::myCallback, (MyClass*)classInstance, _1 ) ); (from outside the class) or: - * setDestructorCallback( boost::bind( &MyClass::myCallback, this, _1 ) ); (from inside the class). + * If you want to bind to a class member, you also need to pass a pointer to the class itself, using the OgreNewt::bind system, like so: + * setDestructorCallback( OgreNewt::bind( &MyClass::myCallback, (MyClass*)classInstance, _1 ) ); (from outside the class) or: + * setDestructorCallback( OgreNewt::bind( &MyClass::myCallback, this, _1 ) ); (from inside the class). * * You can also use: * setDestructorCallback<>( &MyClass::myCallback, (MyClass*)classInstance ); (from outside the class) or: @@ -141,9 +161,9 @@ * */ void setDestructorCallback( DestructorCallbackFunction fun ) { m_callback = fun; } - template<class c> void setDestructorCallback( boost::function<void(c*, DerivedClass*)> callback, c *instancedClassPointer ) + template<class c> void setDestructorCallback( OgreNewt::function<void(c*, DerivedClass*)> callback, c *instancedClassPointer ) { - setDestructorCallback( boost::bind(callback, instancedClassPointer, _1) ); + setDestructorCallback( OgreNewt::bind(callback, instancedClassPointer, _1) ); } private: DestructorCallbackFunction m_callback; Modified: branches/ogrenewt/newton20/inc/OgreNewt_World.h =================================================================== --- branches/ogrenewt/newton20/inc/OgreNewt_World.h 2011-07-22 03:27:15 UTC (rev 2984) +++ branches/ogrenewt/newton20/inc/OgreNewt_World.h 2011-08-22 01:45:12 UTC (rev 2985) @@ -85,7 +85,7 @@ callback binding to member classes is exactly the same as the various callbacks for the Body class. */ - typedef boost::function<void(OgreNewt::Body*, int threadIndex)> + typedef OgreNewt::function<void(OgreNewt::Body*, int threadIndex)> LeaveWorldCallback; public: @@ -354,10 +354,10 @@ sets the callback to be used when a Body leaves the World limits. */ void setLeaveWorldCallback(LeaveWorldCallback callback); - template<class c> void setLeaveWorldCallback(boost::function<void( + template<class c> void setLeaveWorldCallback(OgreNewt::function<void( c*, Body*, int)> callback, c *instancedClassPointer) { - setLeaveWorldCallback(boost::bind(callback, + setLeaveWorldCallback(OgreNewt::bind(callback, instancedClassPointer, _1, _2)); } Modified: branches/ogrenewt/newton20/inc/OgreNewt_stdafx.h =================================================================== --- branches/ogrenewt/newton20/inc/OgreNewt_stdafx.h 2011-07-22 03:27:15 UTC (rev 2984) +++ branches/ogrenewt/newton20/inc/OgreNewt_stdafx.h 2011-08-22 01:45:12 UTC (rev 2985) @@ -38,12 +38,8 @@ #include <dQuaternion.h> #include <NewtonCustomJoint.h> - #include <boost/function.hpp> - #include <boost/bind.hpp> - - #ifndef OGRENEWT_NO_COLLISION_SHAREDPTR - # include <boost/shared_ptr.hpp> - #endif - + + #include "OgreNewt_Prerequisites.h" + #endif Modified: branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp =================================================================== --- branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp 2011-07-22 03:27:15 UTC (rev 2984) +++ branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp 2011-08-22 01:45:12 UTC (rev 2985) @@ -3,6 +3,7 @@ #include "OgreNewt_Tools.h" #include "OgreNewt_RayCast.h" #include "OgreNewt_World.h" +#include "OgreNewt_Body.h" #ifdef __APPLE__ # include <Ogre/OgreEntity.h> @@ -20,808 +21,1006 @@ namespace CollisionPrimitives { - // OgreNewt::CollisionPrimitives::Null - Null::Null(const OgreNewt::World *world) : Collision( world ) - { - m_col = NewtonCreateNull( m_world->getNewtonWorld() ); - } + // OgreNewt::CollisionPrimitives::Null + Null::Null(const OgreNewt::World *world) : + Collision(world) + { + m_col = NewtonCreateNull(m_world->getNewtonWorld()); + } + // OgreNewt::CollisionPrimitives::Box + Box::Box(const World* world) : + ConvexCollision(world) + { + } - // OgreNewt::CollisionPrimitives::Box - Box::Box(const World* world) : ConvexCollision( world ) - {} + Box::Box(const World* world, const Ogre::Vector3& size, int id, + const Ogre::Quaternion& orient, const Ogre::Vector3& pos) : + ConvexCollision(world) + { + float matrix[16]; - Box::Box( const World* world, const Ogre::Vector3& size, int id, const Ogre::Quaternion& orient, const Ogre::Vector3& pos ) : ConvexCollision( world ) - { - float matrix[16]; + OgreNewt::Converters::QuatPosToMatrix(orient, pos, &matrix[0]); - OgreNewt::Converters::QuatPosToMatrix( orient, pos, &matrix[0] ); + m_col = NewtonCreateBox(m_world->getNewtonWorld(), (float) size.x, + (float) size.y, (float) size.z, id, &matrix[0]); + } - m_col = NewtonCreateBox( m_world->getNewtonWorld(), (float)size.x, (float)size.y, (float)size.z, id, &matrix[0] ); - } + // OgreNewt::CollisionPrimitives::Ellipsoid + Ellipsoid::Ellipsoid(const World* world) : + ConvexCollision(world) + { + } + Ellipsoid::Ellipsoid(const World* world, const Ogre::Vector3& size, + int id, const Ogre::Quaternion& orient, + const Ogre::Vector3& pos) : + ConvexCollision(world) + { + float matrix[16]; + OgreNewt::Converters::QuatPosToMatrix(orient, pos, &matrix[0]); - // OgreNewt::CollisionPrimitives::Ellipsoid - Ellipsoid::Ellipsoid(const World* world) : ConvexCollision( world ) - {} + m_col = NewtonCreateSphere(m_world->getNewtonWorld(), + (float) size.x, (float) size.y, (float) size.z, id, + &matrix[0]); + } - Ellipsoid::Ellipsoid( const World* world, const Ogre::Vector3& size, int id, const Ogre::Quaternion& orient, const Ogre::Vector3& pos ) : ConvexCollision( world ) - { - float matrix[16]; + // OgreNewt::CollisionPrimitives::Cylinder + Cylinder::Cylinder(const World* world) : + ConvexCollision(world) + { + } - OgreNewt::Converters::QuatPosToMatrix( orient, pos, &matrix[0] ); + Cylinder::Cylinder(const World* world, Ogre::Real radius, + Ogre::Real height, int id, const Ogre::Quaternion& orient, + const Ogre::Vector3& pos) : + ConvexCollision(world) + { + float matrix[16]; - m_col = NewtonCreateSphere( m_world->getNewtonWorld(), (float)size.x, (float)size.y, (float)size.z, id, &matrix[0] ); - } + OgreNewt::Converters::QuatPosToMatrix(orient, pos, &matrix[0]); + m_col = NewtonCreateCylinder(m_world->getNewtonWorld(), + (float) radius, (float) height, id, &matrix[0]); + } - // OgreNewt::CollisionPrimitives::Cylinder - Cylinder::Cylinder(const World* world) : ConvexCollision( world ) - {} + // OgreNewt::CollisionPrimitives::Capsule + Capsule::Capsule(const World* world) : + ConvexCollision(world) + { + } - Cylinder::Cylinder( const World* world, Ogre::Real radius, Ogre::Real height, int id, - const Ogre::Quaternion& orient, const Ogre::Vector3& pos ) : ConvexCollision( world ) - { - float matrix[16]; + Capsule::Capsule(const World* world, Ogre::Real radius, + Ogre::Real height, int id, const Ogre::Quaternion& orient, + const Ogre::Vector3& pos) : + ConvexCollision(world) + { + float matrix[16]; - OgreNewt::Converters::QuatPosToMatrix( orient, pos, &matrix[0] ); + OgreNewt::Converters::QuatPosToMatrix(orient, pos, &matrix[0]); - m_col = NewtonCreateCylinder( m_world->getNewtonWorld(), (float)radius, (float)height, id, &matrix[0] ); - } + m_col = NewtonCreateCapsule(m_world->getNewtonWorld(), + (float) radius, (float) height, id, &matrix[0]); + } + // OgreNewt::CollisionPrimitives::Cone + Cone::Cone(const World* world) : + ConvexCollision(world) + { + } - // OgreNewt::CollisionPrimitives::Capsule - Capsule::Capsule(const World* world) : ConvexCollision( world ) - {} + Cone::Cone(const World* world, Ogre::Real radius, Ogre::Real height, + int id, const Ogre::Quaternion& orient, + const Ogre::Vector3& pos) : + ConvexCollision(world) + { + float matrix[16]; - Capsule::Capsule( const World* world, Ogre::Real radius, Ogre::Real height, int id, - const Ogre::Quaternion& orient, const Ogre::Vector3& pos ) : ConvexCollision( world ) - { - float matrix[16]; + OgreNewt::Converters::QuatPosToMatrix(orient, pos, &matrix[0]); - OgreNewt::Converters::QuatPosToMatrix( orient, pos, &matrix[0] ); + m_col = NewtonCreateCone(m_world->getNewtonWorld(), (float) radius, + (float) height, id, &matrix[0]); + } - m_col = NewtonCreateCapsule( m_world->getNewtonWorld(), (float)radius, (float)height, id, &matrix[0] ); - } + // OgreNewt::CollisionPrimitives::ChamferCylinder + ChamferCylinder::ChamferCylinder(const World* world) : + ConvexCollision(world) + { + } + ChamferCylinder::ChamferCylinder(const World* world, Ogre::Real radius, + Ogre::Real height, int id, const Ogre::Quaternion& orient, + const Ogre::Vector3& pos) : + ConvexCollision(world) + { + float matrix[16]; - // OgreNewt::CollisionPrimitives::Cone - Cone::Cone(const World* world) : ConvexCollision( world ) - {} + OgreNewt::Converters::QuatPosToMatrix(orient, pos, &matrix[0]); - Cone::Cone( const World* world, Ogre::Real radius, Ogre::Real height, int id, - const Ogre::Quaternion& orient, const Ogre::Vector3& pos ) : ConvexCollision( world ) - { - float matrix[16]; + m_col = NewtonCreateChamferCylinder(m_world->getNewtonWorld(), + (float) radius, (float) height, id, &matrix[0]); + } - OgreNewt::Converters::QuatPosToMatrix( orient, pos, &matrix[0] ); + // OgreNewt::CollisionPrimitives::ConvexHull + ConvexHull::ConvexHull(const World* world) : + ConvexCollision(world) + { + } - m_col = NewtonCreateCone( m_world->getNewtonWorld(), (float)radius, (float)height, id, &matrix[0] ); - } + ConvexHull::ConvexHull(const World* world, Ogre::Entity* obj, int id, + const Ogre::Quaternion& orient, const Ogre::Vector3& pos, + Ogre::Real tolerance, const Ogre::Vector3& forceScale) : + ConvexCollision(world) + { + Ogre::Vector3 scale(1.0, 1.0, 1.0); - // OgreNewt::CollisionPrimitives::ChamferCylinder - ChamferCylinder::ChamferCylinder(const World* world) : ConvexCollision( world ) - {} + //get the mesh! + //Ogre::Entity* obj = (Ogre::Entity*)node->getAttachedObject(0); + Ogre::MeshPtr mesh = obj->getMesh(); - ChamferCylinder::ChamferCylinder( const World* world, Ogre::Real radius, Ogre::Real height, int id, - const Ogre::Quaternion& orient, const Ogre::Vector3& pos ) : ConvexCollision( world ) - { - float matrix[16]; + // get scale, if attached to node + Ogre::Node * node = obj->getParentNode(); + if (node) + scale = node->_getDerivedScale(); - OgreNewt::Converters::QuatPosToMatrix( orient, pos, &matrix[0] ); + if (forceScale != Ogre::Vector3::ZERO) + scale = forceScale; - m_col = NewtonCreateChamferCylinder( m_world->getNewtonWorld(), (float)radius, (float)height, id, &matrix[0] ); - } + //find number of submeshes + unsigned short sub = mesh->getNumSubMeshes(); + size_t total_verts = 0; - - // OgreNewt::CollisionPrimitives::ConvexHull - ConvexHull::ConvexHull(const World* world) : ConvexCollision( world ) - {} + Ogre::VertexData* v_data; + bool addedShared = false; - ConvexHull::ConvexHull( const World* world, Ogre::Entity* obj, int id, const Ogre::Quaternion& orient, const Ogre::Vector3& pos, Ogre::Real tolerance, const Ogre::Vector3& forceScale ) : ConvexCollision( world ) - { - Ogre::Vector3 scale(1.0,1.0,1.0); - - //get the mesh! - //Ogre::Entity* obj = (Ogre::Entity*)node->getAttachedObject(0); - Ogre::MeshPtr mesh = obj->getMesh(); + for (unsigned short i = 0; i < sub; i++) + { + Ogre::SubMesh* sub_mesh = mesh->getSubMesh(i); + if (sub_mesh->useSharedVertices) + { + if (!addedShared) + { + v_data = mesh->sharedVertexData; + total_verts += v_data->vertexCount; - // get scale, if attached to node - Ogre::Node * node = obj->getParentNode(); - if (node) scale = node->_getDerivedScale(); + addedShared = true; + } + } + else + { + v_data = sub_mesh->vertexData; + total_verts += v_data->vertexCount; + } + } - if (forceScale != Ogre::Vector3::ZERO) scale = forceScale; + addedShared = false; - //find number of submeshes - unsigned short sub = mesh->getNumSubMeshes(); + //make array to hold vertex positions! + Ogre::Vector3* vertices = new Ogre::Vector3[total_verts]; + unsigned int offset = 0; - size_t total_verts = 0; + //loop back through, adding vertices as we go! + for (unsigned short i = 0; i < sub; i++) + { + Ogre::SubMesh* sub_mesh = mesh->getSubMesh(i); + Ogre::VertexDeclaration* v_decl; + const Ogre::VertexElement* p_elem; + float* v_Posptr; + size_t v_count; - Ogre::VertexData* v_data; - bool addedShared = false; + v_data = NULL; - for (unsigned short i=0;i<sub;i++) - { - Ogre::SubMesh* sub_mesh = mesh->getSubMesh(i); - if (sub_mesh->useSharedVertices) - { - if (!addedShared) - { - v_data = mesh->sharedVertexData; - total_verts += v_data->vertexCount; + if (sub_mesh->useSharedVertices) + { + if (!addedShared) + { + v_data = mesh->sharedVertexData; + v_count = v_data->vertexCount; + v_decl = v_data->vertexDeclaration; + p_elem = v_decl->findElementBySemantic( + Ogre::VES_POSITION); + addedShared = true; + } + } + else + { + v_data = sub_mesh->vertexData; + v_count = v_data->vertexCount; + v_decl = v_data->vertexDeclaration; + p_elem = v_decl->findElementBySemantic(Ogre::VES_POSITION); + } - addedShared = true; - } - } - else - { - v_data = sub_mesh->vertexData; - total_verts += v_data->vertexCount; - } - } - - addedShared = false; + if (v_data) + { + size_t start = v_data->vertexStart; + //pointer + Ogre::HardwareVertexBufferSharedPtr v_sptr = + v_data->vertexBufferBinding->getBuffer( + p_elem->getSource()); + unsigned char* v_ptr = + static_cast<unsigned char*> (v_sptr->lock( + Ogre::HardwareBuffer::HBL_READ_ONLY)); + unsigned char* v_offset; - //make array to hold vertex positions! - Ogre::Vector3* vertices = new Ogre::Vector3[total_verts]; - unsigned int offset = 0; + //loop through vertex data... + for (size_t j = start; j < (start + v_count); j++) + { + //get offset to Position data! + v_offset = v_ptr + (j * v_sptr->getVertexSize()); + p_elem->baseVertexPointerToElement(v_offset, &v_Posptr); - //loop back through, adding vertices as we go! - for (unsigned short i=0;i<sub;i++) - { - Ogre::SubMesh* sub_mesh = mesh->getSubMesh(i); - Ogre::VertexDeclaration* v_decl; - const Ogre::VertexElement* p_elem; - float* v_Posptr; - size_t v_count; - - v_data = NULL; + //now get vertex positions... + vertices[offset].x = *v_Posptr; + v_Posptr++; + vertices[offset].y = *v_Posptr; + v_Posptr++; + vertices[offset].z = *v_Posptr; + v_Posptr++; - if (sub_mesh->useSharedVertices) - { - if (!addedShared) - { - v_data = mesh->sharedVertexData; - v_count = v_data->vertexCount; - v_decl = v_data->vertexDeclaration; - p_elem = v_decl->findElementBySemantic( Ogre::VES_POSITION ); - addedShared = true; - } - } - else - { - v_data = sub_mesh->vertexData; - v_count = v_data->vertexCount; - v_decl = v_data->vertexDeclaration; - p_elem = v_decl->findElementBySemantic( Ogre::VES_POSITION ); - } + vertices[offset] *= scale; - if (v_data) - { - size_t start = v_data->vertexStart; - //pointer - Ogre::HardwareVertexBufferSharedPtr v_sptr = v_data->vertexBufferBinding->getBuffer( p_elem->getSource() ); - unsigned char* v_ptr = static_cast<unsigned char*>(v_sptr->lock( Ogre::HardwareBuffer::HBL_READ_ONLY )); - unsigned char* v_offset; + offset++; + } - //loop through vertex data... - for (size_t j=start; j<(start+v_count); j++) - { - //get offset to Position data! - v_offset = v_ptr + (j * v_sptr->getVertexSize()); - p_elem->baseVertexPointerToElement( v_offset, &v_Posptr ); + //unlock buffer + v_sptr->unlock(); + } - //now get vertex positions... - vertices[offset].x = *v_Posptr; v_Posptr++; - vertices[offset].y = *v_Posptr; v_Posptr++; - vertices[offset].z = *v_Posptr; v_Posptr++; + } - vertices[offset] *= scale; + float matrix[16]; - offset++; - } + OgreNewt::Converters::QuatPosToMatrix(orient, pos, &matrix[0]); - //unlock buffer - v_sptr->unlock(); - } + //okay, let's try making the ConvexHull! + m_col = NewtonCreateConvexHull(m_world->getNewtonWorld(), + (int) total_verts, (float*) &vertices[0].x, + sizeof(Ogre::Vector3), tolerance, id, &matrix[0]); - - } + delete[] vertices; - float matrix[16]; + } - OgreNewt::Converters::QuatPosToMatrix( orient, pos, &matrix[0] ); - - //okay, let's try making the ConvexHull! - m_col = NewtonCreateConvexHull( m_world->getNewtonWorld(), (int)total_verts, (float*)&vertices[0].x, sizeof(Ogre::Vector3), tolerance, id, &matrix[0] ); + // OgreNewt::CollisionPrimitives::ConvexHull + ConvexHull::ConvexHull(const World* world, const Ogre::Vector3* verts, + int vertcount, int id, const Ogre::Quaternion& orient, + const Ogre::Vector3& pos, Ogre::Real tolerance) : + ConvexCollision(world) + { + float matrix[16]; + OgreNewt::Converters::QuatPosToMatrix(orient, pos, &matrix[0]); - delete []vertices; + //make the collision primitive. + m_col = NewtonCreateConvexHull(m_world->getNewtonWorld(), + vertcount, (float*) &verts[0].x, sizeof(Ogre::Vector3), + tolerance, id, &matrix[0]); + } - } + TreeCollision::TreeCollision(const World* world) : + Collision(world) + { + } + TreeCollision::TreeCollision(const World* world, Ogre::Entity* obj, + bool optimize, int id, FaceWinding fw) : + Collision(world) + { + Ogre::Vector3 scale; - // OgreNewt::CollisionPrimitives::ConvexHull - ConvexHull::ConvexHull( const World* world, const Ogre::Vector3* verts, int vertcount, int id, const Ogre::Quaternion& orient, const Ogre::Vector3& pos, Ogre::Real tolerance ) : ConvexCollision( world ) - { - float matrix[16]; - OgreNewt::Converters::QuatPosToMatrix( orient, pos, &matrix[0] ); + start(id); - //make the collision primitive. - m_col = NewtonCreateConvexHull( m_world->getNewtonWorld(), vertcount, (float*)&verts[0].x, sizeof(Ogre::Vector3), tolerance, id, &matrix[0]); - } + Ogre::MeshPtr mesh = obj->getMesh(); + // get scale, if attached to node + Ogre::Node * node = obj->getParentNode(); + if (node) + scale = node->_getDerivedScale(); - TreeCollision::TreeCollision( const World* world) : Collision(world) - { - } + //find number of sub-meshes + unsigned short sub = mesh->getNumSubMeshes(); + for (unsigned short cs = 0; cs < sub; cs++) + { + Ogre::SubMesh* sub_mesh = mesh->getSubMesh(cs); - TreeCollision::TreeCollision( const World* world, Ogre::Entity* obj, bool optimize, int id, FaceWinding fw ) : Collision( world ) - { - Ogre::Vector3 scale; + //vertex data! + Ogre::VertexData* v_data; - start(id); + if (sub_mesh->useSharedVertices) + { + v_data = mesh->sharedVertexData; + } + else + { + v_data = sub_mesh->vertexData; + } - Ogre::MeshPtr mesh = obj->getMesh(); + //let's find more information about the Vertices... + Ogre::VertexDeclaration* v_decl = v_data->vertexDeclaration; + const Ogre::VertexElement* p_elem = + v_decl->findElementBySemantic(Ogre::VES_POSITION); - // get scale, if attached to node - Ogre::Node * node = obj->getParentNode(); - if (node) scale = node->_getDerivedScale(); + // get pointer! + Ogre::HardwareVertexBufferSharedPtr v_sptr = + v_data->vertexBufferBinding->getBuffer( + p_elem->getSource()); + unsigned char* v_ptr = + static_cast<unsigned char*> (v_sptr->lock( + Ogre::HardwareBuffer::HBL_READ_ONLY)); - //find number of sub-meshes - unsigned short sub = mesh->getNumSubMeshes(); + //now find more about the index!! + Ogre::IndexData* i_data = sub_mesh->indexData; + size_t index_count = i_data->indexCount; + size_t poly_count = index_count / 3; - for (unsigned short cs=0;cs<sub;cs++) - { - Ogre::SubMesh* sub_mesh = mesh->getSubMesh(cs); + // get pointer! + Ogre::HardwareIndexBufferSharedPtr i_sptr = i_data->indexBuffer; - //vertex data! - Ogre::VertexData* v_data; + // 16 or 32 bit indices? + bool uses32bit = (i_sptr->getType() + == Ogre::HardwareIndexBuffer::IT_32BIT); + unsigned long* i_Longptr; + unsigned short* i_Shortptr; - if (sub_mesh->useSharedVertices) - { - v_data = mesh->sharedVertexData; - } - else - { - v_data = sub_mesh->vertexData; - } - - //let's find more information about the Vertices... - Ogre::VertexDeclaration* v_decl = v_data->vertexDeclaration; - const Ogre::VertexElement* p_elem = v_decl->findElementBySemantic( Ogre::VES_POSITION ); - - // get pointer! - Ogre::HardwareVertexBufferSharedPtr v_sptr = v_data->vertexBufferBinding->getBuffer( p_elem->getSource() ); - unsigned char* v_ptr = static_cast<unsigned char*>(v_sptr->lock( Ogre::HardwareBuffer::HBL_READ_ONLY )); - - //now find more about the index!! - Ogre::IndexData* i_data = sub_mesh->indexData; - size_t index_count = i_data->indexCount; - size_t poly_count = index_count / 3; - - // get pointer! - Ogre::HardwareIndexBufferSharedPtr i_sptr = i_data->indexBuffer; - - // 16 or 32 bit indices? - bool uses32bit = ( i_sptr->getType() == Ogre::HardwareIndexBuffer::IT_32BIT ); - unsigned long* i_Longptr; - unsigned short* i_Shortptr; - - - if ( uses32bit) - { - i_Longptr = static_cast<unsigned long*>(i_sptr->lock( Ogre::HardwareBuffer::HBL_READ_ONLY )); - - } - else - { - i_Shortptr = static_cast<unsigned short*>(i_sptr->lock( Ogre::HardwareBuffer::HBL_READ_ONLY )); - } + if (uses32bit) + { + i_Longptr = static_cast<unsigned long*> (i_sptr->lock( + Ogre::HardwareBuffer::HBL_READ_ONLY)); + } + else + { + i_Shortptr = static_cast<unsigned short*> (i_sptr->lock( + Ogre::HardwareBuffer::HBL_READ_ONLY)); + } - //now loop through the indices, getting polygon info! - int i_offset = 0; + //now loop through the indices, getting polygon info! + int i_offset = 0; - for (size_t i=0; i<poly_count; i++) - { - Ogre::Vector3 poly_verts[3]; - unsigned char* v_offset; - float* v_Posptr; - int idx; + for (size_t i = 0; i < poly_count; i++) + { + Ogre::Vector3 poly_verts[3]; + unsigned char* v_offset; + float* v_Posptr; + int idx; - if (uses32bit) - { - for (int j=0;j<3;j++) - { - idx = i_Longptr[i_offset+j]; // index to first vertex! - v_offset = v_ptr + (idx * v_sptr->getVertexSize()); - p_elem->baseVertexPointerToElement( v_offset, &v_Posptr ); - //now get vertex position from v_Posptr! - poly_verts[j].x = *v_Posptr; v_Posptr++; - poly_verts[j].y = *v_Posptr; v_Posptr++; - poly_verts[j].z = *v_Posptr; v_Posptr++; + if (uses32bit) + { + for (int j = 0; j < 3; j++) + { + idx = i_Longptr[i_offset + j]; // index to first vertex! + v_offset = v_ptr + (idx * v_sptr->getVertexSize()); + p_elem->baseVertexPointerToElement(v_offset, + &v_Posptr); + //now get vertex position from v_Posptr! + poly_verts[j].x = *v_Posptr; + v_Posptr++; + poly_verts[j].y = *v_Posptr; + v_Posptr++; + poly_verts[j].z = *v_Posptr; + v_Posptr++; - poly_verts[j] *= scale; - } - } - else - { - for (int j=0;j<3;j++) - { - idx = i_Shortptr[i_offset+j]; // index to first vertex! - v_offset = v_ptr + (idx * v_sptr->getVertexSize()); - p_elem->baseVertexPointerToElement( v_offset, &v_Posptr ); - //now get vertex position from v_Posptr! + poly_verts[j] *= scale; + } + } + else + { + for (int j = 0; j < 3; j++) + { + idx = i_Shortptr[i_offset + j]; // index to first vertex! + v_offset = v_ptr + (idx * v_sptr->getVertexSize()); + p_elem->baseVertexPointerToElement(v_offset, + &v_Posptr); + //now get vertex position from v_Posptr! - // switch poly winding. - poly_verts[j].x = *v_Posptr; v_Posptr++; - poly_verts[j].y = *v_Posptr; v_Posptr++; - poly_verts[j].z = *v_Posptr; v_Posptr++; - - poly_verts[j] *= scale; - } - } - - if (fw == FW_DEFAULT) - { - addPoly( poly_verts, cs ); - } - else - { - Ogre::Vector3 rev_poly_verts[3]; - rev_poly_verts[0] = poly_verts[0]; - rev_poly_verts[0] = poly_verts[2]; - rev_poly_verts[0] = poly_verts[1]; + // switch poly winding. + poly_verts[j].x = *v_Posptr; + v_Posptr++; + poly_verts[j].y = *v_Posptr; + v_Posptr++; + poly_verts[j].z = *v_Posptr; + v_Posptr++; - addPoly( rev_poly_verts, cs ); - } + poly_verts[j] *= scale; + } + } - i_offset += 3; - } + if (fw == FW_DEFAULT) + { + addPoly(poly_verts, cs); + } + else + { + Ogre::Vector3 rev_poly_verts[3]; + rev_poly_verts[0] = poly_verts[0]; + rev_poly_verts[0] = poly_verts[2]; + rev_poly_verts[0] = poly_verts[1]; - //unlock the buffers! - v_sptr->unlock(); - i_sptr->unlock(); - - } - //done! - finish( optimize ); - } + addPoly(rev_poly_verts, cs); + } + i_offset += 3; + } - TreeCollision::TreeCollision(const OgreNewt::World *world, int numVertices, int numIndices, const float *vertices, const int *indices, bool optimize, int id, FaceWinding fw) : OgreNewt::Collision( world ) - { - start(id); - - int numPolys = numIndices / 3; - - Ogre::Vector3 *vecVertices = new Ogre::Vector3[numVertices]; - - for (int curVertex = 0; curVertex < numVertices; curVertex++) - { - vecVertices[curVertex].x = vertices[0 + curVertex * 3]; - vecVertices[curVertex].y = vertices[1 + curVertex * 3]; - vecVertices[curVertex].z = vertices[2 + curVertex * 3]; - } - - for ( int poly = 0; poly < numPolys; poly++ ) - { - Ogre::Vector3 poly_verts[3]; - - if (fw == FW_DEFAULT) - { - poly_verts[0] = vecVertices[indices[0 + poly * 3]]; - poly_verts[1] = vecVertices[indices[1 + poly * 3]]; - poly_verts[2] = vecVertices[indices[2 + poly * 3]]; - } - else - { - poly_verts[0] = vecVertices[indices[0 + poly * 3]]; - poly_verts[2] = vecVertices[indices[1 + poly * 3]]; - poly_verts[1] = vecVertices[indices[2 + poly * 3]]; - } - - addPoly( poly_verts, 0 ); - } - - delete [] vecVertices; - - finish( optimize ); - } + //unlock the buffers! + v_sptr->unlock(); + i_sptr->unlock(); + } + //done! + finish(optimize); + } - TreeCollision::TreeCollision( const World* world, int numVertices, Ogre::Vector3* vertices, Ogre::IndexData* indexData, bool optimize, int id, FaceWinding fw) : Collision( world ) - { - start(id); + TreeCollision::TreeCollision(const OgreNewt::World *world, + int numVertices, int numIndices, const float *vertices, + const int *indices, bool optimize, int id, FaceWinding fw) : + OgreNewt::Collision(world) + { + start(id); - unsigned int numPolys = indexData->indexCount / 3; - Ogre::HardwareIndexBufferSharedPtr hwIndexBuffer=indexData->indexBuffer; - size_t indexSize=hwIndexBuffer->getIndexSize(); - void* indices=hwIndexBuffer->lock(Ogre::HardwareBuffer::HBL_READ_ONLY); + int numPolys = numIndices / 3; - assert((indexSize==2) || (indexSize==4)); + Ogre::Vector3 *vecVertices = new Ogre::Vector3[numVertices]; - if (indexSize==2) - { - unsigned short* curIndex=(unsigned short*)indices; - for ( unsigned int poly = 0; poly < numPolys; poly++ ) - { - Ogre::Vector3 poly_verts[3]; + for (int curVertex = 0; curVertex < numVertices; curVertex++) + { + vecVertices[curVertex].x = vertices[0 + curVertex * 3]; + vecVertices[curVertex].y = vertices[1 + curVertex * 3]; + vecVertices[curVertex].z = vertices[2 + curVertex * 3]; + } - //invert vertex winding (otherwise, raycasting won't work???) - if (fw == FW_DEFAULT) - { - poly_verts[0] = vertices[*curIndex]; curIndex++; - poly_verts[1] = vertices[*curIndex]; curIndex++; - poly_verts[2] = vertices[*curIndex]; curIndex++; - } - else - { - poly_verts[0] = vertices[*curIndex]; curIndex++; - poly_verts[2] = vertices[*curIndex]; curIndex++; - poly_verts[1] = vertices[*curIndex]; curIndex++; - } + for (int poly = 0; poly < numPolys; poly++) + { + Ogre::Vector3 poly_verts[3]; - addPoly( poly_verts, 0 ); - } - } - else - { - unsigned int* curIndex=(unsigned int*)indices; - for ( unsigned int poly = 0; poly < numPolys; poly++ ) - { - Ogre::Vector3 poly_verts[3]; + if (fw == FW_DEFAULT) + { + poly_verts[0] = vecVertices[indices[0 + poly * 3]]; + poly_verts[1] = vecVertices[indices[1 + poly * 3]]; + poly_verts[2] = vecVertices[indices[2 + poly * 3]]; + } + else + { + poly_verts[0] = vecVertices[indices[0 + poly * 3]]; + poly_verts[2] = vecVertices[indices[1 + poly * 3]]; + poly_verts[1] = vecVertices[indices[2 + poly * 3]]; + } - if (fw == FW_DEFAULT) - { - poly_verts[0] = vertices[*curIndex]; curIndex++; - poly_verts[1] = vertices[*curIndex]; curIndex++; - poly_verts[2] = vertices[*curIndex]; curIndex++; - } - else - { - poly_verts[0] = vertices[*curIndex]; curIndex++; - poly_verts[2] = vertices[*curIndex]; curIndex++; - poly_verts[1] = vertices[*curIndex]; curIndex++; - } + addPoly(poly_verts, 0); + } - addPoly( poly_verts, 0 ); - } - } - - hwIndexBuffer->unlock(); - finish( optimize ); - } + delete[] vecVertices; + finish(optimize); + } - void TreeCollision::start(int id) - { - m_col = NewtonCreateTreeCollision( m_world->getNewtonWorld(), id ); - NewtonTreeCollisionBeginBuild( m_col ); - } + TreeCollision::TreeCollision(const World* world, int numVertices, + Ogre::Vector3* vertices, Ogre::IndexData* indexData, + bool optimize, int id, FaceWinding fw) : + Collision(world) + { + start(id); - void TreeCollision::addPoly( Ogre::Vector3* polys, unsigned int ID ) - { - NewtonTreeCollisionAddFace( m_col, 3, (float*)&polys[0].x, sizeof(Ogre::Vector3), ID ); - } + unsigned int numPolys = indexData->indexCount / 3; + Ogre::HardwareIndexBufferSharedPtr hwIndexBuffer = + indexData->indexBuffer; + size_t indexSize = hwIndexBuffer->getIndexSize(); + void* indices = hwIndexBuffer->lock( + Ogre::HardwareBuffer::HBL_READ_ONLY); - void TreeCollision::finish( bool optimize ) - { - NewtonTreeCollisionEndBuild( m_col, optimize ); - } + assert((indexSize==2) || (indexSize==4)); + if (indexSize == 2) + { + unsigned short* curIndex = (unsigned short*) indices; + for (unsigned int poly = 0; poly < numPolys; poly++) + { + Ogre::Vector3 poly_verts[3]; - float _CDECL TreeCollision::newtonRayCastCallback(const NewtonBody* body,const NewtonCollision* col,float interception, float *normal, int faceId, void *userData) - { - Body* bod = static_cast<Raycast*>(userData)->mLastBody; - OgreNewt::CollisionPtr collision = static_cast<Raycast*>(userData)->mLastCollision; - - //! TODO: what do we need ... [truncated message content] |
From: <sf...@us...> - 2011-07-22 03:27:22
|
Revision: 2984 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2984&view=rev Author: sfcbias Date: 2011-07-22 03:27:15 +0000 (Fri, 22 Jul 2011) Log Message: ----------- Updated to build with Newton 2.33. Modified Paths: -------------- branches/ogrenewt/newton20/CMakeLists.txt branches/ogrenewt/newton20/INSTALL.TXT branches/ogrenewt/newton20/OgreNewt.pc.cmake Added Paths: ----------- branches/ogrenewt/newton20/OgreNewt.pc branches/ogrenewt/newton20/cmake_install.cmake Modified: branches/ogrenewt/newton20/CMakeLists.txt =================================================================== --- branches/ogrenewt/newton20/CMakeLists.txt 2011-07-22 03:16:44 UTC (rev 2983) +++ branches/ogrenewt/newton20/CMakeLists.txt 2011-07-22 03:27:15 UTC (rev 2984) @@ -8,7 +8,7 @@ SET(CPACK_PACKAGE_CONTACT "co...@ra...") SET(OgreNewt_MAJOR_VERSION 2) -SET(OgreNewt_MINOR_VERSION 0) +SET(OgreNewt_MINOR_VERSION 1) SET(OgreNewt_PATCH_VERSION 0) SET(CPACK_PACKAGE_VERSION_MAJOR ${OgreNewt_MAJOR_VERSION}) @@ -55,7 +55,7 @@ # Check for required components FIND_PACKAGE(PkgConfig) -FIND_PACKAGE(OGRE 1.4 REQUIRED) +FIND_PACKAGE(OGRE 1.6 REQUIRED) FIND_PACKAGE(Newton 2.0 REQUIRED) # Compile settings for build types @@ -68,7 +68,11 @@ ${OGRE_INCLUDE_DIRS} ${NEWTON_INCLUDE_DIR} ${NEWTON_INCLUDE_DIR}/dCustomJoints -${NEWTON_INCLUDE_DIR}/dMath) +${NEWTON_INCLUDE_DIR}/dMath +${NEWTON_INCLUDE_DIR}/../../../packages +${NEWTON_INCLUDE_DIR}/../../../packages/dCustomJoints +${NEWTON_INCLUDE_DIR}/../../../packages/dMath +) SET(OgreNewt_LIB_SRCS src/OgreNewt_BasicJoints.cpp @@ -122,4 +126,4 @@ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) ENDIF(NOT WIN32) -PRINT_ENABLED_FEATURES() \ No newline at end of file +PRINT_ENABLED_FEATURES() Modified: branches/ogrenewt/newton20/INSTALL.TXT =================================================================== --- branches/ogrenewt/newton20/INSTALL.TXT 2011-07-22 03:16:44 UTC (rev 2983) +++ branches/ogrenewt/newton20/INSTALL.TXT 2011-07-22 03:27:15 UTC (rev 2984) @@ -15,6 +15,12 @@ "BOOST_HOME" - boost directory (get the latest from http://boost.org) "NEWTON_HOME" - NGD install directory "OGRENEWT_HOME" - OgreNewt root directory + + FOR NEWTON 2.33: + The project files are those from the older versions of OgreNewt, you will need to change the project include directories to + newton-2.33(or whatever you have it named)/packages + newton-2.33(or whatever you have it named)/core_200/source/newton + If set properly, everything should compile and work out of the box, even the dll's are automaticly copied. @@ -41,4 +47,4 @@ > sudo make install -Visit the forum if you have problems or have new project files to share :) \ No newline at end of file +Visit the forum if you have problems or have new project files to share :) Added: branches/ogrenewt/newton20/OgreNewt.pc =================================================================== --- branches/ogrenewt/newton20/OgreNewt.pc (rev 0) +++ branches/ogrenewt/newton20/OgreNewt.pc 2011-07-22 03:27:15 UTC (rev 2984) @@ -0,0 +1,11 @@ +prefix=/usr/local +exec_prefix=/usr/local +libdir=/usr/local/lib +includedir=/usr/local/include/OgreNewt + +Name: OgreNewt +Description: Ogre Bindings for the Newton Physics SDK +Requires: OGRE >= 1.6 +Version: 2.1.0 +Libs: -L/usr/local/lib -lOgreNewt +Cflags: -I/usr/local/include/OgreNewt Modified: branches/ogrenewt/newton20/OgreNewt.pc.cmake =================================================================== --- branches/ogrenewt/newton20/OgreNewt.pc.cmake 2011-07-22 03:16:44 UTC (rev 2983) +++ branches/ogrenewt/newton20/OgreNewt.pc.cmake 2011-07-22 03:27:15 UTC (rev 2984) @@ -5,7 +5,7 @@ Name: OgreNewt Description: Ogre Bindings for the Newton Physics SDK -Requires: OGRE >= 1.4 +Requires: OGRE >= 1.6 Version: ${OgreNewt_MAJOR_VERSION}.${OgreNewt_MINOR_VERSION}.${OgreNewt_PATCH_VERSION} Libs: -L${CMAKE_INSTALL_PREFIX}/lib -lOgreNewt Cflags: -I${CMAKE_INSTALL_PREFIX}/include/OgreNewt Added: branches/ogrenewt/newton20/cmake_install.cmake =================================================================== --- branches/ogrenewt/newton20/cmake_install.cmake (rev 0) +++ branches/ogrenewt/newton20/cmake_install.cmake 2011-07-22 03:27:15 UTC (rev 2984) @@ -0,0 +1,111 @@ +# Install script for directory: /home/bryce/Dev/OgreNewt + +# Set the install prefix +IF(NOT DEFINED CMAKE_INSTALL_PREFIX) + SET(CMAKE_INSTALL_PREFIX "/usr/local") +ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) +STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") + +# Set the install configuration name. +IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) + IF(BUILD_TYPE) + STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" + CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") + ELSE(BUILD_TYPE) + SET(CMAKE_INSTALL_CONFIG_NAME "") + ENDIF(BUILD_TYPE) + MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") +ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) + +# Set the component getting installed. +IF(NOT CMAKE_INSTALL_COMPONENT) + IF(COMPONENT) + MESSAGE(STATUS "Install component: \"${COMPONENT}\"") + SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") + ELSE(COMPONENT) + SET(CMAKE_INSTALL_COMPONENT) + ENDIF(COMPONENT) +ENDIF(NOT CMAKE_INSTALL_COMPONENT) + +# Install shared libraries without execute permission? +IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) + SET(CMAKE_INSTALL_SO_NO_EXE "1") +ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) + +IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") + FOREACH(file + "$ENV{DESTDIR}/usr/local/lib/libOgreNewt.so.2.1.0" + "$ENV{DESTDIR}/usr/local/lib/libOgreNewt.so.2" + "$ENV{DESTDIR}/usr/local/lib/libOgreNewt.so" + ) + IF(EXISTS "${file}" AND + NOT IS_SYMLINK "${file}") + FILE(RPATH_CHECK + FILE "${file}" + RPATH "") + ENDIF() + ENDFOREACH() + list(APPEND CPACK_ABSOLUTE_DESTINATION_FILES + "/usr/local/lib/libOgreNewt.so.2.1.0;/usr/local/lib/libOgreNewt.so.2;/usr/local/lib/libOgreNewt.so") +FILE(INSTALL DESTINATION "/usr/local/lib" TYPE SHARED_LIBRARY FILES + "/home/bryce/Dev/OgreNewt/libOgreNewt.so.2.1.0" + "/home/bryce/Dev/OgreNewt/libOgreNewt.so.2" + "/home/bryce/Dev/OgreNewt/libOgreNewt.so" + ) + FOREACH(file + "$ENV{DESTDIR}/usr/local/lib/libOgreNewt.so.2.1.0" + "$ENV{DESTDIR}/usr/local/lib/libOgreNewt.so.2" + "$ENV{DESTDIR}/usr/local/lib/libOgreNewt.so" + ) + IF(EXISTS "${file}" AND + NOT IS_SYMLINK "${file}") + IF(CMAKE_INSTALL_DO_STRIP) + EXECUTE_PROCESS(COMMAND "/usr/bin/strip" "${file}") + ENDIF(CMAKE_INSTALL_DO_STRIP) + ENDIF() + ENDFOREACH() +ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") + +IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") + list(APPEND CPACK_ABSOLUTE_DESTINATION_FILES + "/usr/local/include/OgreNewt/OgreNewt_BasicJoints.h;/usr/local/include/OgreNewt/OgreNewt_Body.h;/usr/local/include/OgreNewt/OgreNewt_Collision.h;/usr/local/include/OgreNewt/OgreNewt_CollisionPrimitives.h;/usr/local/include/OgreNewt/OgreNewt_CollisionSerializer.h;/usr/local/include/OgreNewt/OgreNewt_ContactCallback.h;/usr/local/include/OgreNewt/OgreNewt_Debugger.h;/usr/local/include/OgreNewt/OgreNewt.h;/usr/local/include/OgreNewt/OgreNewt_Joint.h;/usr/local/include/OgreNewt/OgreNewt_MaterialID.h;/usr/local/include/OgreNewt/OgreNewt_MaterialPair.h;/usr/local/include/OgreNewt/OgreNewt_Prerequisites.h;/usr/local/include/OgreNewt/OgreNewt_RayCast.h;/usr/local/include/OgreNewt/OgreNewt_Tools.h;/usr/local/include/OgreNewt/OgreNewt_Vehicle.h;/usr/local/include/OgreNewt/OgreNewt_World.h;/usr/local/include/OgreNewt/OgreNewt_PlayerController.h;/usr/local/include/OgreNewt/OgreNewt_ContactJoint.h;/usr/local/include/OgreNewt/OgreNewt_BodyInAABBIterator.h;/usr/local/include/OgreNewt/OgreNewt_BasicFrameListener.h") +FILE(INSTALL DESTINATION "/usr/local/include/OgreNewt" TYPE FILE FILES + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_BasicJoints.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_Body.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_Collision.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_CollisionPrimitives.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_CollisionSerializer.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_ContactCallback.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_Debugger.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_Joint.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_MaterialID.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_MaterialPair.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_Prerequisites.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_RayCast.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_Tools.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_Vehicle.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_World.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_PlayerController.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_ContactJoint.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_BodyInAABBIterator.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_BasicFrameListener.h" + ) +ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") + +IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") + list(APPEND CPACK_ABSOLUTE_DESTINATION_FILES + "/usr/local/lib/pkgconfig/OgreNewt.pc") +FILE(INSTALL DESTINATION "/usr/local/lib/pkgconfig" TYPE FILE FILES "/home/bryce/Dev/OgreNewt/OgreNewt.pc") +ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") + +IF(CMAKE_INSTALL_COMPONENT) + SET(CMAKE_INSTALL_MANIFEST "install_manifest_${CMAKE_INSTALL_COMPONENT}.txt") +ELSE(CMAKE_INSTALL_COMPONENT) + SET(CMAKE_INSTALL_MANIFEST "install_manifest.txt") +ENDIF(CMAKE_INSTALL_COMPONENT) + +FILE(WRITE "/home/bryce/Dev/OgreNewt/${CMAKE_INSTALL_MANIFEST}" "") +FOREACH(file ${CMAKE_INSTALL_MANIFEST_FILES}) + FILE(APPEND "/home/bryce/Dev/OgreNewt/${CMAKE_INSTALL_MANIFEST}" "${file}\n") +ENDFOREACH(file) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sf...@us...> - 2011-07-22 03:16:52
|
Revision: 2983 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2983&view=rev Author: sfcbias Date: 2011-07-22 03:16:44 +0000 (Fri, 22 Jul 2011) Log Message: ----------- Updated to build with Newton 2.33. Modified Paths: -------------- branches/ogrenewt/newton20/inc/OgreNewt_Body.h branches/ogrenewt/newton20/inc/OgreNewt_Collision.h branches/ogrenewt/newton20/inc/OgreNewt_CollisionPrimitives.h branches/ogrenewt/newton20/inc/OgreNewt_ContactJoint.h branches/ogrenewt/newton20/inc/OgreNewt_Prerequisites.h branches/ogrenewt/newton20/inc/OgreNewt_RayCast.h branches/ogrenewt/newton20/inc/OgreNewt_World.h branches/ogrenewt/newton20/inc/OgreNewt_stdafx.h branches/ogrenewt/newton20/src/OgreNewt_BasicFrameListener.cpp branches/ogrenewt/newton20/src/OgreNewt_BasicJoints.cpp branches/ogrenewt/newton20/src/OgreNewt_Body.cpp branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp branches/ogrenewt/newton20/src/OgreNewt_ContactJoint.cpp branches/ogrenewt/newton20/src/OgreNewt_RayCast.cpp branches/ogrenewt/newton20/src/OgreNewt_World.cpp Added Paths: ----------- branches/ogrenewt/newton20/.cproject branches/ogrenewt/newton20/.project Added: branches/ogrenewt/newton20/.cproject =================================================================== --- branches/ogrenewt/newton20/.cproject (rev 0) +++ branches/ogrenewt/newton20/.cproject 2011-07-22 03:16:44 UTC (rev 2983) @@ -0,0 +1,954 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?fileVersion 4.0.0?> + +<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage"> +<storageModule moduleId="org.eclipse.cdt.core.settings"> +<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.146808483"> +<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.146808483" moduleId="org.eclipse.cdt.core.settings" name="Debug"> +<externalSettings> +<externalSetting> +<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/OgreNewt"/> +<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/OgreNewt/Debug"/> +</externalSetting> +</externalSettings> +<extensions> +<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> +<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> +<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> +<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> +</extensions> +</storageModule> +<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/> +<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/> +<storageModule moduleId="cdtBuildSystem" version="4.0.0"> +<configuration artifactExtension="a" artifactName="OgreNewt" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.146808483" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug"> +<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.146808483." name="/" resourcePath=""> +<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1431410859" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug"> +<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1615617559" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/> +<builder buildPath="${workspace_loc:/OgreNewt/Debug}" id="cdt.managedbuild.target.gnu.builder.exe.debug.64934918" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/> +<tool id="cdt.managedbuild.tool.gnu.archiver.base.981563462" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/> +<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.740136212" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug"> +<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.629869464" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/> +<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.925478268" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/> +<option id="gnu.cpp.compiler.option.include.paths.866742881" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath"> +<listOptionValue builtIn="false" value="/usr/include/OGRE"/> +<listOptionValue builtIn="false" value="/usr/include/Newton/dMath"/> +<listOptionValue builtIn="false" value=""${workspace_loc:/OgreNewt/inc}""/> +<listOptionValue builtIn="false" value="/usr/include/Newton"/> +<listOptionValue builtIn="false" value="/usr/include/Newton/dCustomJoints"/> +</option> +<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1151350807" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/> +</tool> +<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1628215465" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug"> +<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.115868040" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/> +<option id="gnu.c.compiler.exe.debug.option.debugging.level.1319888951" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/> +<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.68416923" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> +</tool> +<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.289230271" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/> +<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1825451809" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug"> +<option id="gnu.cpp.link.option.libs.965630787" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs"> +<listOptionValue builtIn="false" value="Newton"/> +</option> +<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1233710170" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input"> +<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> +<additionalInput kind="additionalinput" paths="$(LIBS)"/> +</inputType> +</tool> +<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.1520577905" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug"> +<inputType id="cdt.managedbuild.tool.gnu.assembler.input.399447167" superClass="cdt.managedbuild.tool.gnu.assembler.input"/> +</tool> +</toolChain> +</folderInfo> +<sourceEntries> +<entry excluding="demos" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> +</sourceEntries> +</configuration> +</storageModule> +<storageModule moduleId="scannerConfiguration"> +<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="makefileGenerator"> +<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.146808483;cdt.managedbuild.config.gnu.exe.debug.146808483.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1628215465;cdt.managedbuild.tool.gnu.c.compiler.input.68416923"> +<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="makefileGenerator"> +<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +</scannerConfigBuildInfo> +<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.959407960;cdt.managedbuild.config.gnu.exe.release.959407960.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.935483871;cdt.managedbuild.tool.gnu.c.compiler.input.1979321520"> +<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="makefileGenerator"> +<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +</scannerConfigBuildInfo> +<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.959407960;cdt.managedbuild.config.gnu.exe.release.959407960.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.833375409;cdt.managedbuild.tool.gnu.cpp.compiler.input.58340854"> +<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="makefileGenerator"> +<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +</scannerConfigBuildInfo> +<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.146808483;cdt.managedbuild.config.gnu.exe.debug.146808483.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.740136212;cdt.managedbuild.tool.gnu.cpp.compiler.input.1151350807"> +<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="makefileGenerator"> +<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +</scannerConfigBuildInfo> +</storageModule> +<storageModule moduleId="org.eclipse.cdt.core.pathentry"/> +<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> +</cconfiguration> +<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.959407960"> +<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.959407960" moduleId="org.eclipse.cdt.core.settings" name="Release"> +<externalSettings/> +<extensions> +<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> +<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> +<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> +<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> +<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> +</extensions> +</storageModule> +<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/> +<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/> +<storageModule moduleId="cdtBuildSystem" version="4.0.0"> +<configuration artifactName="OgreNewt" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.959407960" name="Release" parent="cdt.managedbuild.config.gnu.exe.release"> +<folderInfo id="cdt.managedbuild.config.gnu.exe.release.959407960." name="/" resourcePath=""> +<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.1676463579" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release"> +<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.2014891524" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/> +<builder buildPath="${workspace_loc:/OgreNewt/Release}" id="cdt.managedbuild.target.gnu.builder.exe.release.1962508948" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/> +<tool id="cdt.managedbuild.tool.gnu.archiver.base.1506878326" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/> +<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.833375409" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release"> +<option id="gnu.cpp.compiler.exe.release.option.optimization.level.1720228660" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/> +<option id="gnu.cpp.compiler.exe.release.option.debugging.level.1993553231" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/> +<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.58340854" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/> +</tool> +<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.935483871" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release"> +<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.618441684" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/> +<option id="gnu.c.compiler.exe.release.option.debugging.level.1185999883" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/> +<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1979321520" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> +</tool> +<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.1772974585" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/> +<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.1828249673" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release"> +<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1360084252" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input"> +<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> +<additionalInput kind="additionalinput" paths="$(LIBS)"/> +</inputType> +</tool> +<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.1887339327" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release"> +<inputType id="cdt.managedbuild.tool.gnu.assembler.input.656417025" superClass="cdt.managedbuild.tool.gnu.assembler.input"/> +</tool> +</toolChain> +</folderInfo> +<sourceEntries> +<entry excluding="demos" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> +</sourceEntries> +</configuration> +</storageModule> +<storageModule moduleId="scannerConfiguration"> +<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="makefileGenerator"> +<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.146808483;cdt.managedbuild.config.gnu.exe.debug.146808483.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.1628215465;cdt.managedbuild.tool.gnu.c.compiler.input.68416923"> +<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="makefileGenerator"> +<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +</scannerConfigBuildInfo> +<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.959407960;cdt.managedbuild.config.gnu.exe.release.959407960.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.935483871;cdt.managedbuild.tool.gnu.c.compiler.input.1979321520"> +<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="makefileGenerator"> +<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +</scannerConfigBuildInfo> +<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.959407960;cdt.managedbuild.config.gnu.exe.release.959407960.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.833375409;cdt.managedbuild.tool.gnu.cpp.compiler.input.58340854"> +<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="makefileGenerator"> +<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +</scannerConfigBuildInfo> +<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.146808483;cdt.managedbuild.config.gnu.exe.debug.146808483.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.740136212;cdt.managedbuild.tool.gnu.cpp.compiler.input.1151350807"> +<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="makefileGenerator"> +<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"> +<buildOutputProvider> +<openAction enabled="true" filePath=""/> +<parser enabled="true"/> +</buildOutputProvider> +<scannerInfoProvider id="specsFile"> +<runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/> +<parser enabled="true"/> +</scannerInfoProvider> +</profile> +</scannerConfigBuildInfo> +</storageModule> +<storageModule moduleId="org.eclipse.cdt.core.pathentry"/> +<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> +</cconfiguration> +</storageModule> +<storageModule moduleId="cdtBuildSystem" version="4.0.0"> +<project id="OgreNewt.cdt.managedbuild.target.gnu.exe.1989702260" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/> +</storageModule> +</cproject> Property changes on: branches/ogrenewt/newton20/.cproject ___________________________________________________________________ Added: svn:mime-type + text/plain Added: branches/ogrenewt/newton20/.project =================================================================== --- branches/ogrenewt/newton20/.project (rev 0) +++ branches/ogrenewt/newton20/.project 2011-07-22 03:16:44 UTC (rev 2983) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>OgreNewt</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name> + <triggers>clean,full,incremental,</triggers> + <arguments> + <dictionary> + <key>?name?</key> + <value></value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.append_environment</key> + <value>true</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.autoBuildTarget</key> + <value>all</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.buildArguments</key> + <value></value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.buildCommand</key> + <value>make</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.buildLocation</key> + <value>${workspace_loc:/OgreNewt/Debug}</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.cleanBuildTarget</key> + <value>clean</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.contents</key> + <value>org.eclipse.cdt.make.core.activeConfigSettings</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.enableAutoBuild</key> + <value>false</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.enableCleanBuild</key> + <value>true</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.enableFullBuild</key> + <value>true</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.fullBuildTarget</key> + <value>all</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.stopOnError</key> + <value>true</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key> + <value>true</value> + </dictionary> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.cdt.core.cnature</nature> + <nature>org.eclipse.cdt.core.ccnature</nature> + <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature> + <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature> + </natures> +</projectDescription> Property changes on: branches/ogrenewt/newton20/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: branches/ogrenewt/newton20/inc/OgreNewt_Body.h =================================================================== --- branches/ogrenewt/newton20/inc/OgreNewt_Body.h 2011-06-22 18:14:38 UTC (rev 2982) +++ branches/ogrenewt/newton20/inc/OgreNewt_Body.h 2011-07-22 03:16:44 UTC (rev 2983) @@ -528,6 +528,9 @@ NodeUpdateNotifyCallback m_nodeupdatenotifycallback; private: + //!Internal + //Creates a OgreNewt::Body directly from a NewtonBody ptr + Body(NewtonBody* body); static void _CDECL newtonDestructor( const NewtonBody* body ); Modified: branches/ogrenewt/newton20/inc/OgreNewt_Collision.h =================================================================== --- branches/ogrenewt/newton20/inc/OgreNewt_Collision.h 2011-06-22 18:14:38 UTC (rev 2982) +++ branches/ogrenewt/newton20/inc/OgreNewt_Collision.h 2011-07-22 03:16:44 UTC (rev 2983) @@ -62,7 +62,7 @@ Collision( const NewtonCollision* collision, const World* world); - //! destructor + //! destructorGetIdentityMatrix virtual ~Collision(); //! retrieve the Newton pointer Modified: branches/ogrenewt/newton20/inc/OgreNewt_CollisionPrimitives.h =================================================================== --- branches/ogrenewt/newton20/inc/OgreNewt_CollisionPrimitives.h 2011-06-22 18:14:38 UTC (rev 2982) +++ branches/ogrenewt/newton20/inc/OgreNewt_CollisionPrimitives.h 2011-07-22 03:16:44 UTC (rev 2983) @@ -1,23 +1,21 @@ /* - OgreNewt Library + OgreNewt Library - Ogre implementation of Newton Game Dynamics SDK + Ogre implementation of Newton Game Dynamics SDK - OgreNewt basically has no license, you may use any or all of the library however you desire... I hope it can help you in any way. + OgreNewt basically has no license, you may use any or all of the library however you desire... I hope it can help you in any way. - by Walaber - some changes by melven + by Walaber + some changes by melven -*/ + */ #ifndef _INCLUDE_OGRENEWT_COLLISIONPRIMITIVES #define _INCLUDE_OGRENEWT_COLLISIONPRIMITIVES - #include "OgreNewt_Prerequisites.h" #include "OgreNewt_Collision.h" #include "OgreNewt_MaterialID.h" - // OgreNewt namespace. all functions and classes use this namespace. namespace OgreNewt { @@ -25,448 +23,517 @@ //! set of basic collision shapes namespace CollisionPrimitives { - //! face-winding enum. - enum FaceWinding { FW_DEFAULT, FW_REVERSE }; + //! face-winding enum. + enum FaceWinding + { + FW_DEFAULT, + FW_REVERSE + }; - //! null collision (results in no collision) - class _OgreNewtExport Null : public OgreNewt::Collision - { - public: - //! constructor - Null( const World* world ); + //! null collision (results in no collision) + class _OgreNewtExport Null: public OgreNewt::Collision + { + public: + //! constructor + Null(const World* world); - //! destructor - ~Null() {} - }; + //! destructor + ~Null() + { + } + }; + //! standard primitive Box. + class _OgreNewtExport Box: public OgreNewt::ConvexCollision + { + public: + //! constructor + /*! + Create a 'blank' box collision object. Can be used for CollisionSerializer::importCollision + \param world pointer to the OgreNewt::World + */ + Box(const World* world); - //! standard primitive Box. - class _OgreNewtExport Box : public OgreNewt::ConvexCollision - { - public: - //! constructor - /*! - Create a 'blank' box collision object. Can be used for CollisionSerializer::importCollision - \param world pointer to the OgreNewt::World - */ - Box(const World* world); + //! constructor + /*! + \param world pointer to OgreNewt::World + \param size vector representing width, height, depth + \param id an id for this shape, can be received with collision->getUserId() + \param orient orientation offset of the primitive + \param pos position offset of the primitive + */ + Box(const World* world, const Ogre::Vector3& size, int id, + const Ogre::Quaternion& orient = + Ogre::Quaternion::IDENTITY, + const Ogre::Vector3& pos = Ogre::Vector3::ZERO); - //! constructor - /*! - \param world pointer to OgreNewt::World - \param size vector representing width, height, depth - \param id an id for this shape, can be received with collision->getUserId() - \param orient orientation offset of the primitive - \param pos position offset of the primitive - */ - Box( const World* world, const Ogre::Vector3& size, int id, - const Ogre::Quaternion& orient = Ogre::Quaternion::IDENTITY, const Ogre::Vector3& pos = Ogre::Vector3::ZERO ); + //! destructor + ~Box() + { + } + }; - //! destructor - ~Box() {} - }; + //! standard primitive Ellipsoid. + class _OgreNewtExport Ellipsoid: public OgreNewt::ConvexCollision + { + public: + //! constructor + /*! + Create a 'blank' ellipsoid collision object. Can be used for CollisionSerializer::importCollision + \param world pointer to the OgreNewt::World + */ + Ellipsoid(const World* world); - //! standard primitive Ellipsoid. - class _OgreNewtExport Ellipsoid : public OgreNewt::ConvexCollision - { - public: - //! constructor - /*! - Create a 'blank' ellipsoid collision object. Can be used for CollisionSerializer::importCollision - \param world pointer to the OgreNewt::World - */ - Ellipsoid(const World* world); + //! constructor + /*! + for a sphere, pass the same radius for all 3 axis. + \param world pointer to OgreNewt::World + \param size vector representing radius for all 3 axis + \param id an id for this shape, can be received with collision->getUserId() + \param orient orientation offset of the primitive + \param pos position offset of the primitive + */ + Ellipsoid(const World* world, const Ogre::Vector3& size, + int id, const Ogre::Quaternion& orient = + Ogre::Quaternion::IDENTITY, + const Ogre::Vector3& pos = Ogre::Vector3::ZERO); - //! constructor - /*! - for a sphere, pass the same radius for all 3 axis. - \param world pointer to OgreNewt::World - \param size vector representing radius for all 3 axis - \param id an id for this shape, can be received with collision->getUserId() - \param orient orientation offset of the primitive - \param pos position offset of the primitive - */ - Ellipsoid(const World* world, const Ogre::Vector3& size, int id, - const Ogre::Quaternion& orient = Ogre::Quaternion::IDENTITY, const Ogre::Vector3& pos = Ogre::Vector3::ZERO ); + //! destructor + ~Ellipsoid() + { + } + }; - //! destructor - ~Ellipsoid() {} - }; + //! standard primitive cylinder. + class _OgreNewtExport Cylinder: public OgreNewt::ConvexCollision + { + public: + //! constructor + /*! + Create a 'blank' cylinder collision object. Can be used for CollisionSerializer::importCollision + \param world pointer to the OgreNewt::World + */ + Cylinder(const World* world); - //! standard primitive cylinder. - class _OgreNewtExport Cylinder : public OgreNewt::ConvexCollision - { - public: - //! constructor - /*! - Create a 'blank' cylinder collision object. Can be used for CollisionSerializer::importCollision - \param world pointer to the OgreNewt::World - */ - Cylinder(const World* world); + //! co... [truncated message content] |
From: <spa...@us...> - 2011-06-22 18:14:44
|
Revision: 2982 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2982&view=rev Author: spacegaier Date: 2011-06-22 18:14:38 +0000 (Wed, 22 Jun 2011) Log Message: ----------- Modified Paths: -------------- trunk/ReadMe.txt Modified: trunk/ReadMe.txt =================================================================== --- trunk/ReadMe.txt 2011-06-22 17:00:46 UTC (rev 2981) +++ trunk/ReadMe.txt 2011-06-22 18:14:38 UTC (rev 2982) @@ -1,13 +1,13 @@ -OGRE Add-ons Module -------------------- - -This CVS module is for add-on and tools developers to be able to collaborate -on their projects within the OGRE CVS repository; add-on and tool developers -are only able to commit to specific subfolders of this module, based on the -tools they are working on, rather than having commit access to the whole -repository like core OGRE developers do. - -If you have an add-on project for OGRE that you would like to be hosted here, -contact the team through http://ogre.sourceforge.net. - - +OGRE Add-ons Module +------------------- + +This SVN module is for add-on and tool developers to be able to collaborate +on their projects within the OGRE SVN repository. Add-on and tool developers +are only able to commit to specific subfolders of this module, based on the +tools they are working on, rather than having commit access to the whole +repository like core OGRE developers do. + +If you have an add-on project for OGRE that you would like to be hosted here, +contact the team through http://ogre.sourceforge.net. + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <spa...@us...> - 2011-06-22 17:00:52
|
Revision: 2981 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2981&view=rev Author: spacegaier Date: 2011-06-22 17:00:46 +0000 (Wed, 22 Jun 2011) Log Message: ----------- - removed debug build to save bandwidth, since regular users are not supposed to take it and everyone who wants to debug will have to build the exporter themselves anyway Removed Paths: ------------- trunk/LightwaveExport/bin/debug/ trunk/LightwaveExport/bin/release/LW2Ogre3D.exp trunk/LightwaveExport/bin/release/LW2Ogre3D.lib Deleted: trunk/LightwaveExport/bin/release/LW2Ogre3D.exp =================================================================== (Binary files differ) Deleted: trunk/LightwaveExport/bin/release/LW2Ogre3D.lib =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <spa...@us...> - 2011-06-22 16:58:44
|
Revision: 2980 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2980&view=rev Author: spacegaier Date: 2011-06-22 16:58:34 +0000 (Wed, 22 Jun 2011) Log Message: ----------- - updated to work with Lightwave 9.6 and 10 -> updated to LW SDK 10 and boost 1.46.1 + boost.process from GSocC 2010 - minor fixes: * reduced max UV set number to 8, since Ogre cannot handle more anyway * exporter will now be properly added to MasterPlugins after loading a LWS scene Modified Paths: -------------- trunk/LightwaveExport/README.txt trunk/LightwaveExport/docs/changelog.txt trunk/LightwaveExport/docs/notes.txt trunk/LightwaveExport/include/Lw2Ogre_Config.h trunk/LightwaveExport/include/Lw2Ogre_LwMesh.h trunk/LightwaveExport/include/Lw2Ogre_Prerequisites.h trunk/LightwaveExport/include/OgreVector3.h trunk/LightwaveExport/include/wxAboutPanel.h trunk/LightwaveExport/scripts/Lightwave2Ogre.vcproj trunk/LightwaveExport/src/Lw2Ogre_LwMesh.cpp trunk/LightwaveExport/src/Lw2Ogre_Main.cpp trunk/LightwaveExport/src/Lw2Ogre_MeshExportOptions.cpp trunk/LightwaveExport/src/Lw2Ogre_MeshExporter.cpp trunk/LightwaveExport/src/Lw2Ogre_OgreMesh.cpp trunk/LightwaveExport/src/Lw2Ogre_OgreXmlSkeletonSerializer.cpp trunk/LightwaveExport/src/Lw2Ogre_Service.cpp trunk/LightwaveExport/src/servmain.c trunk/LightwaveExport/src/shutdown.c trunk/LightwaveExport/src/startup.c trunk/LightwaveExport/src/wxAboutPanel.cpp trunk/LightwaveExport/src/wxMeshExporterMeshPanel.cpp trunk/LightwaveExport/src/wxMeshExporterOgreXmlConverterPanel.cpp Added Paths: ----------- trunk/LightwaveExport/bin/ trunk/LightwaveExport/bin/debug/ trunk/LightwaveExport/bin/debug/LW2Ogre3D_d.exp trunk/LightwaveExport/bin/debug/LW2Ogre3D_d.lib trunk/LightwaveExport/bin/debug/LW2Ogre3D_d.p trunk/LightwaveExport/bin/release/ trunk/LightwaveExport/bin/release/LW2Ogre3D.exp trunk/LightwaveExport/bin/release/LW2Ogre3D.lib trunk/LightwaveExport/bin/release/LW2Ogre3D.p trunk/LightwaveExport/deps/ trunk/LightwaveExport/deps/lwdsdk10.0/ trunk/LightwaveExport/deps/lwdsdk10.0/README.txt trunk/LightwaveExport/deps/lwdsdk10.0/include/ trunk/LightwaveExport/deps/lwdsdk10.0/include/carbonrel.h trunk/LightwaveExport/deps/lwdsdk10.0/include/generators/ trunk/LightwaveExport/deps/lwdsdk10.0/include/generators/lwedgegenerator.h trunk/LightwaveExport/deps/lwdsdk10.0/include/generators/lwpointgenerator.h trunk/LightwaveExport/deps/lwdsdk10.0/include/generators/lwpolygenerator.h trunk/LightwaveExport/deps/lwdsdk10.0/include/legacy/ trunk/LightwaveExport/deps/lwdsdk10.0/include/legacy/lwspreadsheet.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwanimlod.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwanimsav.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwanimuv.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcamera.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwchange.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwchannel.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcmdseq.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcolorspace.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcomring.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcustobj.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdialog.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdisplay.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdisplce.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdopetrack.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdyna.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwenvel.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwenviron.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwextrend.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwfilter.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwframbuf.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwgeneric.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwgizmo.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwglobsrv.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwhandler.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwhost.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwimage.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwimageio.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwio.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwlaytool.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwlcore.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwlight.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwmaster.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwmath.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwmeshedt.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwmeshes.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwmodeler.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwmodtool.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwmodule.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwmonitor.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwmotion.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwmtutil.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwnodeeditor.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwnodes.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwobjimp.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwobjrep.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwpanel.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwplugin.exp trunk/LightwaveExport/deps/lwdsdk10.0/include/lwpolygon.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwpreview.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwprtcl.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwrender.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwscenecv.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwsceneeditor.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwserver.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwshader.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwshelf.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwsurf.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwsurfed.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwtexture.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwtimer.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwtool.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwtxtr.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwtxtred.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwtypes.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwvolume.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwvparm.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwvpobject.h trunk/LightwaveExport/deps/lwdsdk10.0/include/lwxpanel.h trunk/LightwaveExport/deps/lwdsdk10.0/lib/ trunk/LightwaveExport/deps/lwdsdk10.0/lib/server.lib trunk/LightwaveExport/deps/lwdsdk10.0/lib/server_d.lib trunk/LightwaveExport/deps/lwdsdk10.0/source/ trunk/LightwaveExport/deps/lwdsdk10.0/source/serv.def trunk/LightwaveExport/deps/lwdsdk10.0/source/servdesc.c trunk/LightwaveExport/deps/lwdsdk10.0/source/servmain.c trunk/LightwaveExport/deps/lwdsdk10.0/source/shutdown.c trunk/LightwaveExport/deps/lwdsdk10.0/source/startup.c trunk/LightwaveExport/deps/lwdsdk10.0/source/username.c trunk/LightwaveExport/deps/tinyXml/ trunk/LightwaveExport/deps/tinyXml/readme.txt trunk/LightwaveExport/deps/tinyXml/tinystr.cpp trunk/LightwaveExport/deps/tinyXml/tinystr.h trunk/LightwaveExport/deps/tinyXml/tinyxml.cpp trunk/LightwaveExport/deps/tinyXml/tinyxml.h trunk/LightwaveExport/deps/tinyXml/tinyxmlerror.cpp trunk/LightwaveExport/deps/tinyXml/tinyxmlparser.cpp Removed Paths: ------------- trunk/LightwaveExport/tinyXml/ Modified: trunk/LightwaveExport/README.txt =================================================================== --- trunk/LightwaveExport/README.txt 2011-02-16 18:45:31 UTC (rev 2979) +++ trunk/LightwaveExport/README.txt 2011-06-22 16:58:34 UTC (rev 2980) @@ -1,43 +1,40 @@ -Dependencies ------------- - -TinyXml 2.4.2 -Boost 1.33.1 -wxWidgets 2.8.0 -Lightwave 7.5 SDK - - - -TinyXml is provided, you will not need to download it. - - -The plugin is using the following boost libraries : - -lexical_cast -variant -function -bind -date_time -process - - -It's better to build the plugin with the Lightwave 7.5 SDK to make it compatible with Lightwave 7.5 and above, but you should be able to build it using the lastest Lightwave SDK. - - -Windows -------- - -A solution for building the plugin with MSVC 2005 is provided. - - -Mac users ---------- - -If anybody is interested into building the plugin for Mac, please contact me. - - -Documentation -------------- - -The sources used to build the documentation is available into the /Docs/Sources directory. - +Dependencies +------------ + +TinyXml 2.4.2 +Boost 1.33.0 or higher +wxWidgets 2.8.X +Lightwave 9.6 SDK or higher + + +TinyXml is provided, you will not need to download it. + +The provided binaries were compiled with LW SDK 10, but work in LW 9.6 and LW 10. + +The plugin is using the following boost libraries : + +lexical_cast +variant +function +bind +date_time +process (http://www.highscore.de/boost/gsoc2010/process.zip) + + +Windows +------- + +A solution for building the plugin with Visual Studio is provided. + + +Mac users +--------- + +If anybody is interested into building the plugin for Mac, please contact me. + + +Documentation +------------- + +The sources used to build the documentation is available into the /docs/sources directory. + Added: trunk/LightwaveExport/bin/debug/LW2Ogre3D_d.exp =================================================================== (Binary files differ) Property changes on: trunk/LightwaveExport/bin/debug/LW2Ogre3D_d.exp ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/LightwaveExport/bin/debug/LW2Ogre3D_d.lib =================================================================== (Binary files differ) Property changes on: trunk/LightwaveExport/bin/debug/LW2Ogre3D_d.lib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/LightwaveExport/bin/debug/LW2Ogre3D_d.p =================================================================== (Binary files differ) Property changes on: trunk/LightwaveExport/bin/debug/LW2Ogre3D_d.p ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/LightwaveExport/bin/release/LW2Ogre3D.exp =================================================================== (Binary files differ) Property changes on: trunk/LightwaveExport/bin/release/LW2Ogre3D.exp ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/LightwaveExport/bin/release/LW2Ogre3D.lib =================================================================== (Binary files differ) Property changes on: trunk/LightwaveExport/bin/release/LW2Ogre3D.lib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/LightwaveExport/bin/release/LW2Ogre3D.p =================================================================== (Binary files differ) Property changes on: trunk/LightwaveExport/bin/release/LW2Ogre3D.p ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/LightwaveExport/deps/lwdsdk10.0/README.txt =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/README.txt (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/README.txt 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,10 @@ +Note +---- + +This is not the complete LW SDK 10, but rather only the parts needed to compile the exporter: + +/include -> needed headers +/source -> source files to create server.lib which the exportesr needs to link + (libs are already created, so in fact source is not needed) +/lib -> the two server lib files needed to comiple the exporter (debug and release version) + Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/carbonrel.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/carbonrel.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/carbonrel.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,7 @@ +#define _MACOS +#define RELEASE +#define MAC_OS_X +#define ACCESSOR_CALLS_ARE_FUNCTIONS 1 +#define OPAQUE_TOOLBOX_STRUCTS 1 +#define TARGET_API_MAC_CARBON 1 + Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/generators/lwedgegenerator.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/generators/lwedgegenerator.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/generators/lwedgegenerator.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,14 @@ +#ifndef LWSDK_EDGE_GENERATOR_H +#define LWSDK_EDGE_GENERATOR_H + +#include <lwmeshes.h> + +struct LWEdgeGenerator +{ + struct LWEdgeGeneratorDetail* detail; + void (*destroy)(struct LWEdgeGenerator* gen); + struct LWEdgeGenerator* (*clone)(struct LWEdgeGenerator* gen); + LWEdgeID (*generate)(struct LWEdgeGenerator* gen); +}; + +#endif Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/generators/lwpointgenerator.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/generators/lwpointgenerator.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/generators/lwpointgenerator.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,14 @@ +#ifndef LWSDK_POINT_GENERATOR_H +#define LWSDK_POINT_GENERATOR_H + +#include <lwmeshes.h> + +struct LWPointGenerator +{ + struct LWPointGeneratorDetail* detail; + void (*destroy)(struct LWPointGenerator* gen); + struct LWPointGenerator* (*clone)(struct LWPointGenerator* gen); + LWPntID (*generate)(struct LWPointGenerator* gen); +}; + +#endif Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/generators/lwpolygenerator.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/generators/lwpolygenerator.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/generators/lwpolygenerator.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,14 @@ +#ifndef LWSDK_POLYGON_GENERATOR_H +#define LWSDK_POLYGON_GENERATOR_H + +#include <lwmeshes.h> + +struct LWPolyGenerator +{ + struct LWPolyGeneratorDetail* detail; + void (*destroy)(struct LWPolyGenerator* gen); + struct LWPolyGenerator* (*clone)(struct LWPolyGenerator* gen); + LWPolID (*generate)(struct LWPolyGenerator* gen); +}; + +#endif Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/legacy/lwspreadsheet.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/legacy/lwspreadsheet.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/legacy/lwspreadsheet.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,139 @@ +/* + * LWSDK Header File + * Copyright 1999, NewTek, Inc. + * + * LWSPREADSHEET.H -- LightWave SpreadSheet bank registration + * $Log: lwspreadsheet.h,v $ + * Revision 7.1 2004/01/30 13:52:03 haven + * *** empty log message *** + * + * Revision 1.1 2003/08/26 19:02:02 haven + * Initial check-in + * + * + */ + +#ifndef LWSDK_SPREADSHEET_H +#define LWSDK_SPREADSHEET_H + +#include <lwtypes.h> +#include <lwpanel.h> +#include <lwrender.h> + +#define LWIMP_GLOBAL "SpreadsheetSceneManagerGlobal" + +/* + * The following are predefined column types. IDs starting with undescores + * are reserved for future use. If you want to make a custom type, be sure + * to provide a custom interface and custom draw callbank. + */ + /* Datatype - Description */ +#define IMPCOLTYPE_TOGGLE LWID_( '_', 'T', 'G', 'L' ) /* int - Checkbox or similar toggle (Unseen By Camera, Cast Shadows) */ +#define IMPCOLTYPE_INTEGER LWID_( '_', 'I', 'N', 'T' ) /* int - Integer based control (Subpatch Level, Area Light Quality */ +#define IMPCOLTYPE_PERCENT LWID_( '_', 'P', 'C', 'T' ) /* double - Floating point number displayed as a percentage. 1.0 is 100% (Light Intensity, Blur Lrngth) */ +#define IMPCOLTYPE_DISTANCE LWID_( '_', 'D', 'S', 'T' ) /* double - Floating point number displayed as a distance in meters (Focal Distance, Light Range) */ +#define IMPCOLTYPE_ANGLE LWID_( '_', 'A', 'N', 'G' ) /* double - Floating point number displayed as an angle in degrees (Heading Limits, Light Cone Angle) */ +#define IMPCOLTYPE_TIME LWID_( '_', 'S', 'E', 'C' ) /* double - Floating point number displayed as a time in seconds */ +#define IMPCOLTYPE_FLOAT LWID_( '_', 'F', 'L', 'T' ) /* double - Floating point number (Anti-Aliasing Threshold, Metaball Resolution) */ +#define IMPCOLTYPE_LIST LWID_( '_', 'L', 'S', 'T' ) /* int - Pre-determined list of items. Must provide list callbacks (Item Visibility, Subdivision Order) */ +#define IMPCOLTYPE_FILE LWID_( '_', 'F', 'I', 'L' ) /* char * - Text string representing a file (PFX File) */ +#define IMPCOLTYPE_STRING LWID_( '_', 'S', 'T', 'R' ) /* char * - Text string (Item Name, Comment) */ +#define IMPCOLTYPE_COLOR LWID_( '_', 'C', 'L', 'R' ) /* float[3] - RGB Color Triple (Light Color, Edge Color) */ +#define IMPCOLTYPE_ITEM LWID_( '_', 'I', 'T', 'M' ) /* LWItemID - ID of an item (IK Goal, Parent). */ +#define IMPCOLTYPE_IMAGE LWID_( '_', 'I', 'M', 'G' ) /* LWImageID - ID of an image (Projection Image) */ +#define IMPCOLTYPE_VMAP LWID_( '_', 'V', 'M', 'P' ) /* IMPVMap * - Name of a VMAP (Bone Weight Map). testItem() should return a zero-terminated arrow of allowed VMap types (ie: { LWVMAP_WGHT, 0 }) if the test value is LWI_NULL */ + +typedef struct st_IMPVMap { /* Used by IMPCOLTYPE_VMAPs, since both a type and a name are needed to identify a VMap */ + LWID type; /* VMap Type. See lwmeshes.h for common types. */ + const char * name; /* VMap Name. */ +} IMPVMap; + +typedef enum en_IMPGhostModes { /* Your ghosted() function should return one of these values: */ + IMPGHOST_ENABLED, /* Draws the cell normally */ + IMPGHOST_DISABLED, /* Draws a disabled (ghosted) cell */ + IMPGHOST_LABEL, /* Draws the cell normally, but it cannot be selected. You could consider this a "read only" cell */ + IMPGHOST_BLANK, /* Draws a blank (and unselectable) cell. Useful if the column is only relevant to objects and this ID points to a light */ +} IMPGhostModes; + +#define IMPENV_NOT_ENVELOPABLE ((void **)0xFFFFFFFF) /* This cell cannot be enveloped (Linear/Area Light Quality) */ +#define IMPENV_NOT_ENVELOPED ((void **)NULL) /* This cell can be enveloped, but currently is not */ + +typedef enum en_IMPEnvRequests { /* Your envelope() function will get one of these requests: */ + IMPENVREQ_STATE, /* Request the enveloped state. This should be one of IMPENV_NOT_ENVELOPABLE, IMPENV_NOT_ENVELOPED or IMPENV_ENVELOPED */ + IMPENVREQ_APPLY, /* This cell can be enveloped, but currently is not. Return IMPENV_NOT_ENVELOPED or IMPENV_ENVELOPED */ + IMPENVREQ_REMOVE, /* This cell is currently enveloped. Return IMPENV_NOT_ENVELOPED or IMPENV_ENVELOPED */ +} IMPEnvRequests; + +/* + * IMPColumn: + * Provides details about a specific column within a bank + */ +typedef struct st_IMPColumn { + char * title; /* Column Title. If NULL, the custom draw function will be called with row index of -1. */ + int default_width; /* Default width of the column in pixels */ + + LWID type; /* Column Type. Use MakeBankID() to generate one, or use one of the predefined column types above */ + char * comment; /* Column Comment. This will be displayed on the status line when a cell is selected */ + + LWChannelID * (*envelope) ( int column, int row, void * id, IMPEnvRequests request ); /* Envelope Function. IMP handles enveloped cells differently from normal cells. Can be NULL if not envelopable */ + + IMPGhostModes (*ghosted) ( int column, int row, void * id ); /* Ghosted Function. IMP calls this to decide how to draw the control. This should return one of the IMPGhostModes. Can be NULL if always enabled */ + void * (*query) ( int column, int row, void * id, LWTime time ); /* Query Function. IMP calls this to get the current state of this cell */ + void * (*evaluate) ( int column, int row, void * id, LWTime time, void * value, int apply ); /* Evaluate Function. IMP calls this to change the value of a cell. Can be NULL if never returns IMPGHOST_ENABLE */ + int (*compare) ( int column, void *value1, void *value2 ); /* Comparision Function. IMP calls this when sorting by column. Return value is simialr to QSort: 0 means identical, -1 means value1 < value2, and 1 means value1 > value2. Can be NULL */ + + int (*listCount) ( int column, int row, void * id ); /* For IMPCOLTYPE_LIST's, returns the number of items in the list; for other types this can be NULL. If item is LWI_NULL, return all possible items */ + const char * (*listName) ( int column, int row, void * id, int index ); /* For IMPCOLTYPE_LIST's, returns the name of the index item in the list; for other types this can be NULL. If item is LWI_NULL or row is -1, return a complete list of all possible options */ + + int (*testItem) ( int column, int row, void * applied_id, void * queried_id ); /* For IMPCOLTYPE_ITEM, IMPCOLTYPE_IMAGE and IMPCOLTYPE_VMAP's, used to ask if this item id is OK for a particular item. Use this to limit the item list to only lights, for example */ + + int (*customDraw) ( int column, void *value, LWRasterID raster, int x, int y, int w, int h, IMPGhostModes ghosting ); /* Provides a raster that you can draw a custom icon in. Return 0 to have IMP draw the control itself; otherwise, return the optimal width for the column (for autosizing purposes). You can safely draw left of x and right w (it will be clipped by the column edge), but not above y or below h (it will corrupt other rows). */ + + void (*jumpTo) ( int column, int row, void * id ); /* Jump To function. This should present the standard interface for editing this option. For example, a Controller and Limits option could open the Motion Options panel */ + + LWXPanelID customPanel; /* XPanel interface used by IMPCOLTYPE_CUSTOM columns; others can leave this blank */ + + LWChannelID * (*texture) ( int column, int row, void * id, IMPEnvRequests request ); /* Texture Function. IMP handles textured cells differently from normal cells. Can be NULL if no texture allowed */ + void * (*texture_evaluate) ( int column, int row, void * id, LWTime time, double u, double v, void * value, int apply ); /* Evaluate Function. IMP calls this to change the value of a cell. Can be NULL if never returns IMPGHOST_ENABLE */ +} IMPColumn; + +typedef enum en_IMPBaseModes { /* The column's base should be one of these */ + IMPBASE_ITEM, /* Item-specific */ + IMPBASE_CHANNEL /* Channel-specific */ +} IMPBaseModes; + +/* + * IMPBank: + * Provides details about a bank + */ +typedef struct st_IMPBank { + LWID id; /* Bank ID. Use the MakeBankID() macro to convert a string into an ID. */ + char *title; /* Bank Title, as displayed in the Bank Popup */ + + IMPBaseModes base; /* Bank base. Determines what the bank acts on (ie: items or columns) */ + IMPColumn **columns; /* NULL-terminated array of columns in the bank */ + + int (*numRows ) ( LWID bank_id, void * id ); /* Num Rows Function. IMP calls this to ask how many rows this bank needs for this item ID */ + + void (*beginProcess ) ( LWID bank_id ); /* Called before IMP calls any query/evaluate functions. Use this to get bank-specific globals, init arrays, etc. */ + void (*endProcess ) ( LWID bank_id ); /* Called after IMP has called all the query/evalute functions. Use this to free whatever you got during beginProcess() */ +} IMPBank; + +/* + * IMPGlobal: + * This is returned by the IMP Global for use by your plug-in + */ +typedef struct st_IMPGlobal { + int (*registerBank) ( IMPBank *bank ); /* Register a new bank with IMP. You cannot register the same ID twice */ + int (*unregisterBank) ( LWID bank_id ); /* Unregister an existing bank from IMP. */ + + int (*registerBankMaster) ( const char *master_name ); /* Register a new bank master with IMP. This plug-in will be launched automatically when IMP is activated. Returns 1 on succes, -1 if already added and 0 on error */ + int (*unregisterBankMaster) ( const char *master_name ); /* Unregister a bank master. Returns 1 on succes, -1 if already added and 0 on error */ + + int (*refresh) (); /* Ask IMP to refresh it's interface */ + int (*command) ( const char *command_string ); /* Issue a command to IMP. Returns 0 on error */ + +} IMPGlobal; + +#endif + Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/lwanimlod.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/lwanimlod.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/lwanimlod.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,32 @@ +/* + * LWSDK Header File + * Copyright 1999, NewTek, Inc. + * + * LWANIMLOD.H -- LightWave Animation Loaders + */ +#ifndef LWSDK_ANIMLOD_H +#define LWSDK_ANIMLOD_H + +#include <lwimageio.h> +#include <lwhandler.h> + +#define LWANIMLOADER_HCLASS "AnimLoaderHandler" +#define LWANIMLOADER_ICLASS "AnimLoaderInterface" +#define LWANIMLOADER_VERSION 4 + +typedef struct st_LWAnimFrameAccess +{ + void *priv_data; + LWImageProtocolID (*begin) (void *, int type); + void (*done) (void *, LWImageProtocolID); +} LWAnimFrameAccess; + +typedef struct st_LWAnimLoaderHandler { + LWInstanceFuncs *inst; + int (*frameCount) (LWInstance); + double (*frameRate) (LWInstance); + double (*aspect) (LWInstance, int *w, int *h, double *pixAspect); + void (*evaluate) (LWInstance, double, LWAnimFrameAccess *); +} LWAnimLoaderHandler; + +#endif Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/lwanimsav.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/lwanimsav.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/lwanimsav.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,38 @@ +/* + * LWSDK Header File + * Copyright 1999, NewTek, Inc. + * + * LWANIMSAV.H -- LightWave Animation Saver + */ +#ifndef LWSDK_ANIMSAV_H +#define LWSDK_ANIMSAV_H + +#include <lwhandler.h> +#include <lwrender.h> + +#define LWANIMSAVER_HCLASS "AnimSaverHandler" +#define LWANIMSAVER_ICLASS "AnimSaverInterface" +#define LWANIMSAVER_VERSION 4 + +typedef struct st_LWAnimSaverHandler +{ + LWInstanceFuncs *inst; + LWItemFuncs *item; + int type; + LWError (*open) (LWInstance, int w, int h, const char *filename); + void (*close) (LWInstance); + LWError (*begin) (LWInstance); + LWError (*write) (LWInstance, const void *R, const void *G, const void *B, const void *alpha); + +} LWAnimSaverHandler; + +/* + * The saver selects what kind of data it wants with the 'type' field. + * The value of that field selects the type of the data that will be + * passed to the 'write' function. + */ +#define LWAST_UBYTE 0 +#define LWAST_FLOAT 1 + +#endif + Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/lwanimuv.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/lwanimuv.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/lwanimuv.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,31 @@ +/* + * LWSDK Header File + * Copyright 2003, NewTek, Inc. + * + * LWANIMUV.H -- LightWave Animation UV + * + * Jamie L. Finch + * Senile Programmer + */ +#ifndef LWSDK_ANIMUV_H +#define LWSDK_ANIMUV_H + +#include <lwrender.h> + +#define LWANIMUV_HCLASS "AnimUVHandler" +#define LWANIMUV_ICLASS "AnimUVInterface" +#define LWANIMUV_GCLASS "AnimUVGizmo" +#define LWANIMUV_VERSION 4 + +typedef struct st_LWAnimUVHandler { + LWInstanceFuncs *inst; + LWItemFuncs *item; + int (*GetOptions)( LWInstance, char * ); + int (*SetOptions)( LWInstance, char * ); + int (*Begin )( LWInstance, char *, double, int, int, int ); + int (*Evaluate )( LWInstance, int, double * ); + int (*End )( LWInstance ); +} LWAnimUVHandler; + +#endif + Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcamera.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcamera.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcamera.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,57 @@ +/* + * LWSDK Header File + * Copyright 2005, NewTek, Inc. + * + * LWCAMERA.H -- LightWave Camera + */ +#ifndef LWSDK_CAMERA_H +#define LWSDK_CAMERA_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include <lwhandler.h> +#include <lwrender.h> + + +#define LWCAMERA_HCLASS "CameraHandler" +#define LWCAMERA_ICLASS "CameraInterface" +#define LWCAMERA_GCLASS "CameraGizmo" +#define LWCAMERA_VERSION 2 + +typedef struct st_LWCameraAccess +{ + LWItemID cameraID; + LWDVector worldPos; + LWDVector toWorld[3]; + LWDVector toCamera[3]; + double filmSize[2]; +} LWCameraAccess; + +typedef struct st_LWCameraHandler +{ + LWInstanceFuncs* inst; + LWItemFuncs* item; + LWRenderFuncs* rend; + int (*preview) (LWInstance, double lpx, double lpy, LWDMatrix4 projection, const LWCameraAccess* camaccess); + LWError (*newFrame) (LWInstance, const LWFrameInfo* frameinfo, const LWCameraAccess* camaccess); + int (*evaluate) (LWInstance, double fpx, double fpy, double lpx, double lpy, double fractime, LWCameraRay* ray, const LWCameraAccess* camaccess); + unsigned int (*flags) (LWInstance); +} LWCameraHandler; + +// Camera handler evaluation return values +#define LWCAMTYPEEVAL_NO_RAY 0 +#define LWCAMTYPEEVAL_RAY 1 +#define LWCAMTYPEEVAL_DO_DEF_INTERP 3 + +// Camera handler flags +#define LWCAMTYPEF_SUPPORTSDOF (1 << 0) +#define LWCAMTYPEF_SUPPORTSSTEREO (1 << 1) + + +#ifdef __cplusplus +} +#endif + +#endif Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/lwchange.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/lwchange.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/lwchange.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,29 @@ +/* + * LWSDK Header File + * Copyright 2007, NewTek, Inc. + * + * LWCHANGE.H -- LightWave change. + */ + +#ifndef LWSDK_CHANGE_H +#define LWSDK_CHANGE_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include <lwrender.h> + +#define LWCHANGEFUNCS_GLOBAL "Change Functions" + +typedef struct st_lwchangefuncs { + int (*getObjectChangedState)( LWItemID ); /* Gets object save state. */ + int (*getSceneChangedState )( void ); /* Gets scene save state. */ + int (*anyChangesAtAll )( void ); /* Checks for any changes at all in scene. */ +} LWCHANGEFUNCS; + +#ifdef __cplusplus +} +#endif + +#endif Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/lwchannel.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/lwchannel.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/lwchannel.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,36 @@ +/* + * LWSDK Header File + * Copyright 1999, NewTek, Inc. + * + * LWCHANNEL.H -- LightWave Channel Filters + */ +#ifndef LWSDK_CHANNEL_H +#define LWSDK_CHANNEL_H + +#include <lwrender.h> +#include <lwtypes.h> + +#define LWCHANNEL_HCLASS "ChannelHandler" +#define LWCHANNEL_ICLASS "ChannelInterface" +#define LWCHANNEL_GCLASS "ChannelGizmo" +#define LWCHANNEL_VERSION 4 + + +typedef struct st_LWChannelAccess { + LWChannelID chan; + LWFrame frame; + LWTime time; + double value; + void (*getChannel) (LWChannelID chan, LWTime t, double *value); + void (*setChannel) (LWChannelID chan, const double value); + const char * (*channelName) (LWChannelID chan); +} LWChannelAccess; + +typedef struct st_LWChannelHandler { + LWInstanceFuncs *inst; + LWItemFuncs *item; + void (*evaluate) (LWInstance, const LWChannelAccess *); + unsigned int (*flags) (LWInstance); +} LWChannelHandler; + +#endif Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcmdseq.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcmdseq.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcmdseq.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,48 @@ +#ifndef LWSDK_CMDSEQ_H +#define LWSDK_CMDSEQ_H + +/* + * LWSDK Header File + * Copyright 1999, NewTek, Inc. + * + * LWCMDSEQ.H -- LightWave CommandSequence Server + * + * This header contains the types and declarations for the Modeler + * CommandSequence class. + */ + +#include <lwdyna.h> +#include <lwtypes.h> +#include <lwmeshedt.h> + +#define LWMODCOMMAND_CLASS "CommandSequence" +#define LWMODCOMMAND_VERSION 3 + + +typedef struct st_LWModCommand +{ + void *data; + const char *argument; + LWCommandCode (*lookup) (void *, const char *cmdName); + int (*execute) (void *, LWCommandCode cmd, int argc, const DynaValue *argv, EltOpSelect, DynaValue *result); + MeshEditBegin* editBegin; + int (*evaluate) (void *, const char *command); + + void (*undoGroupBegin) (void); + void (*undoGroupEnd) (void); + + MeshEditBegin2 *editBegin2; + +} LWModCommand; + +#define CSERR_NONE 0 +#define CSERR_MEMORY 1 +#define CSERR_IO 2 +#define CSERR_USERABORT 4 +#define CSERR_ARGCOUNT 2901 +#define CSERR_ARGTYPE 2902 +#define CSERR_ARGVALUE 2903 +#define CSERR_OPFAILURE 2904 +#define CSERR_BADSEL 2905 + +#endif Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcolorspace.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcolorspace.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcolorspace.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,104 @@ +/* + * LWSDK Header File + * Copyright 2003, NewTek, Inc. + * + * LWCOLORSPACE.H -- LightWave Color Space + * + * Jamie L. Finch + * Senile Programmer + */ + +#ifndef LWSDK_COLORSPACE_H +#define LWSDK_COLORSPACE_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define LWCOLORSPACEFUNCS_GLOBAL "LWColorSpace" + +typedef enum en_lwcolorspace { + lwcs_linear = 0, /*!< LightWave linear color space. */ + lwcs_sRGB, /*!< Standard RGB color space. */ + lwcs_rec709, /*!< Recommendation BT.709, HDTV. */ + lwcs_cineon, /*!< Eastman Kodak Co. */ + lwcs_ciexyz, /*!< CIE XYZ. */ + lwcs_sizeof +} LWCOLORSPACE; + +typedef enum en_lwcolorspacetypes { + lwcst_viewer = 0, /*!< Viewer color space. */ + lwcst_surface_color, /*!< Surface color space. */ + lwcst_palette_files, /*!< Palette files color space. */ + lwcst_8bit_files, /*!< 8 bit files color space. */ + lwcst_float_files, /*!< Float files color space. */ + lwcst_alpha_files, /*!< Alpha files color space. */ + lwcst_output, /*!< Output files color space. */ + lwcst_output_alpha, /*!< Alpha files color space. */ + lwcst_sizeof +} LWCOLORSPACETYPES; + +typedef enum en_lwcolorspaceconversion { + lwcsc_colorspaceToLinear = 0, /*!< Convert from non-linear to linear. */ + lwcsc_linearToColorspace, /*!< Convert from linear to non-linear. */ + lwcsc_sizeof +} LWCOLORSPACECONVERSION; + +typedef enum en_lwcolorspacelayer { + lwcsl_RGB = 0, /*!< RGB Channel. */ + lwcsl_Alpha, /*!< Alpha Channel. */ + lwcsl_sizeof +} LWCOLORSPACELAYER; + +/** + * struct st_lwimagelookup * + * + * Is a forward reference to the internal lw instance structure ( defined internally ). + * This is used instead of a void * pointer. + */ + +typedef void LWPIXELCONVERSIONRGB( struct st_lwimagelookup *, float *, float * ); /*!< Conversion function prototype. */ +typedef void LWPIXELCONVERSIONALPHA( struct st_lwimagelookup *, float *, float * ); /*!< Conversion function prototype. */ + +/** + * Color space functions. + * + * Color spaces file references are save in the scene file if they are used, + * in the viewer, color space file defaults or in a LWO from the image viewer. + */ + +typedef struct st_lwcolorspacefuncs { + + /* These function are used to get the color space of a loaded converter or load one from the disk. */ + + LWCOLORSPACE (*nameToColorSpace )( char * ); /*!< Color space name. */ + LWCOLORSPACE (*loadPixelLookupTable )( char * ); /*!< File name. */ + + /* These functions are used to get the pixel conversion functions. */ + + LWPIXELCONVERSIONRGB *(*getPixelConversionRGB )( LWCOLORSPACE, LWCOLORSPACECONVERSION, struct st_lwimagelookup ** ); + LWPIXELCONVERSIONALPHA *(*getPixelConversionAlpha)( LWCOLORSPACE, LWCOLORSPACECONVERSION, struct st_lwimagelookup ** ); + + /* These functions are used to get color space names and file names, based on type. */ + + const char *(*colorSpaceName )( LWCOLORSPACETYPES ); /*!< Gets the name of the current color space of the type selected. */ + const char *(*colorSpaceFile )( LWCOLORSPACETYPES ); /*!< Gets the file of the current color space of the type selected. */ + + /* These functions are used in pop-ups. */ + + int (*numberOfColorSpaces )( LWCOLORSPACELAYER ); /*!< Gets the number of loaded color spaces in the layer. */ + const char *(*nameOfColorSpaces )( LWCOLORSPACELAYER, int);/*!< Gets the name of the color space in the layer. */ + LWCOLORSPACE (*indexToColorSpace )( LWCOLORSPACELAYER, int);/*!< Used to convert from indexes of pop-ups to color spaces. */ + int (*colorSpaceToIndex )( LWCOLORSPACELAYER, LWCOLORSPACE ); + + /* This functions is to change the currently selected color space. */ + + int (*setColorSpace )( LWCOLORSPACETYPES, LWCOLORSPACE ); + +} LWColorSpaceFuncs; + +#ifdef __cplusplus +} +#endif + +#endif Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcomring.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcomring.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcomring.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,30 @@ +#ifndef LWSDK_COMRING_H +#define LWSDK_COMRING_H + +/* + * LWSDK Header File + * Copyright 2003, NewTek, Inc. + * + * LWCOMRING.H -- LightWave Communications Ring + * + * This header contains declarations necessary to engage in a + * communications ring among plug-ins + */ + +#define LWCOMRING_GLOBAL "LW Communication Ring" + +typedef void (*RingEvent) (void *clientData,void *portData,int eventCode,void *eventData); + +typedef struct st_LWComRing +{ + int (*ringAttach) (char *topic,LWInstance pidata,RingEvent eventCallback); + void (*ringDetach) (char *topic,LWInstance pidata); + void (*ringMessage) (char *topic,int eventCode,void *eventData); +} LWComRing; + +#define LW_PLUGIN_LIMBO_STATES "LW Plugin Limbo States" + +#define LW_LIMBO_START 0x00000001 +#define LW_LIMBO_END 0x00000002 + +#endif Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcustobj.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcustobj.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/lwcustobj.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,87 @@ +/* + * LWSDK Header File + * Copyright 1999, NewTek, Inc. + * + * LWCUSTOBJ.H -- LightWave Custom Objects + */ +#ifndef LWSDK_CUSTOBJ_H +#define LWSDK_CUSTOBJ_H + +#include <lwrender.h> + +#define LWCUSTOMOBJ_HCLASS "CustomObjHandler" +#define LWCUSTOMOBJ_ICLASS "CustomObjInterface" +#define LWCUSTOMOBJ_GCLASS "CustomObjGizmo" +#define LWCUSTOMOBJ_VERSION 5 + +typedef struct st_LWCustomObjAccess +{ + int view; + int flags; + void *dispData; + void (*setColor) (void *, float rgba[4]); + void (*setPattern) (void *, int lpat); + void (*setTexture) (void *, int, unsigned char *); + void (*setUVs) (void *, double[2], double[2], double[2], double[2]); + void (*point) (void *, double[3], int csys); + void (*line) (void *, double[3], double[3], int csys); + void (*triangle) (void *, double[3], double[3], double[3], int csys); + void (*quad) (void *, double[3], double[3], double[3], double[3], int csys); + void (*circle) (void *, double[3], double, int csys); + void (*text) (void *, double[3], const char *, int just, int csys); + LWDVector viewPos, viewDir; + void (*setCSysItem)(void *, LWItemID item); + void (*polygon) (void *, unsigned int numv, double[][3], int csys); + void (*polyIndexed)(void *, unsigned int numv, unsigned int verts[], double[][3], int csys); + void (*setDrawMode)(void *, unsigned int mode); + void (*disk) (void *, double[3], double, int csys); + void (*setPart) (void *, unsigned int part); + +} LWCustomObjAccess; + +#define LWVIEW_ZY 0 +#define LWVIEW_XZ 1 +#define LWVIEW_XY 2 +#define LWVIEW_PERSP 3 +#define LWVIEW_LIGHT 4 +#define LWVIEW_CAMERA 5 +#define LWVIEW_SCHEMA 6 + +#define LWCOFL_SELECTED (1<<0) +#define LWCOFL_PICKING (1<<1) +#define LWLPAT_SOLID 0 +#define LWLPAT_DOT 1 +#define LWLPAT_DASH 2 +#define LWLPAT_LONGDOT 3 + +#define LWCSYS_WORLD 0 +#define LWCSYS_OBJECT 1 +#define LWCSYS_ICON 2 +#define LWCSYS_VIEWPORT 3 + +#define LWJUST_LEFT 0 +#define LWJUST_CENTER 1 +#define LWJUST_RIGHT 2 + +#define LWDRAWMODE_CULLFACE (1<<0) +#define LWDRAWMODE_OUTLINE (1<<1) +#define LWDRAWMODE_DEPTHTEST (1<<2) +#define LWDRAWMODE_DEPTHWRITE (1<<3) + + +typedef struct st_LWCustomObjHandler +{ + LWInstanceFuncs *inst; + LWItemFuncs *item; + LWRenderFuncs *rend; + void (*evaluate) (LWInstance, const LWCustomObjAccess *); + unsigned int (*flags) (LWInstance); + +} LWCustomObjHandler; + +#define LWCOF_SCHEMA_OK (1<<0) +#define LWCOF_VIEWPORT_INDEX (1<<1) +#define LWCOF_NO_DEPTH_BUFFER (1<<2) +#define LWCOF_OVERLAY (1<<3) + +#endif Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdialog.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdialog.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdialog.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,57 @@ +/* + * LWSDK Header File + * Copyright 1999, NewTek, Inc. + * + * LWDIALOG.H -- LightWave Standard Dialogs + * + * LightWave makes some of its more common requests from the user using + * standard dialogs. These dialogs (or "requesters") are used for getting + * files and paths for saving and loading, and for getting color choices. + * By default, the standard system dialogs are used, but these can be + * overridden by plug-ins of the right class. + */ +#ifndef LWSDK_DIALOG_H +#define LWSDK_DIALOG_H + + +/* + * File dialogs can be configured by servers of this class. + */ +#define LWFILEREQ_CLASS "FileRequester" +#define LWFILEREQ_VERSION 3 + +typedef struct st_LWFileReqLocal { + int reqType; + int result; + const char *title; + const char *fileType; + char *path; + char *baseName; + char *fullName; + int bufLen; + int (*pickName)( void ); +} LWFileReqLocal; + +#define FREQ_LOAD 1 +#define FREQ_SAVE 2 +#define FREQ_DIRECTORY 3 +#define FREQ_MULTILOAD 4 + + +/* + * Color dialogs can be configured by servers of this class. + */ +#define LWCOLORPICK_CLASS "ColorPicker" +#define LWCOLORPICK_VERSION 5 /* This version means your need to supply your own color correction. */ + +typedef void LWHotColorFunc( void *data, float r, float g, float b ); + +typedef struct st_LWColorPickLocal { + int result; + const char *title; + float red, green, blue; + void *data; + LWHotColorFunc *hotFunc; +} LWColorPickLocal; + +#endif Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdisplay.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdisplay.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdisplay.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,75 @@ +/* + * LWSDK Header File + * Copyright 1999, NewTek, Inc. + * + * LWDISPLAY.H -- LightWave Host Display Info + * + * The host application provides a variety of services for getting user + * input, but if all else fails the plug-in may need to open windows. + * Since it runs in the host's context, it needs to get the host's display + * information to do this. This info, which can be normally accessed + * with the "Host Display Info" global service, contains information about + * the windows and display context used by the host. If this ID yeilds a + * null pointer, the server is probably running in a batch mode and has no + * display context. + */ +#ifndef LWSDK_DISPLAY_H +#define LWSDK_DISPLAY_H + +#ifdef _MSWIN + #ifndef _WIN32_WINNT + #define _WIN32_WINNT 0x0400 + #endif + #include <windows.h> +#endif + +#ifdef _XGL + #include <X11/Xlib.h> +#endif + +#if defined( _MACOS) + #if defined( __MACH__) + #include <ApplicationServices/ApplicationServices.h> + #else + #include <Quickdraw.h> + #endif +#endif + + +/* + * The fields of the HostDisplayInfo structure vary from system to system, + * but all include the window pointer of the main application window or + * null if there is none. On X systems, the window session handle is + * passed. On Win32 systems, the application instance is provided, even + * though it belongs to the host and is probably useless. + */ +#define LWHOSTDISPLAYINFO_GLOBAL "Host Display Info" + +#if defined(_MACOS) && (defined(__OBJC__) || defined(__OBJCPP__)) + /* when using this header for _MACOS, compile your source as Objective C or Objective CPP */ + @class LWSDKView; +#endif + +typedef struct st_HostDisplayInfo { + #ifdef _MSWIN + HANDLE instance; + HWND window; + #endif + #ifdef _XGL + Display *xsys; + Window window; + #endif + #ifdef _MACOS + #if defined(__OBJC__) || defined(__OBJCPP__) + union { + WindowPtr window; /* for Carbon-based host pre 9.6.1*/ + LWSDKView *view; /* Cocoa-based host 9.6.1+ */ + } host; + #else + WindowPtr window; /* for Carbon-based host pre 9.6.1*/ + #endif + #endif +} HostDisplayInfo; + +#endif + Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdisplce.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdisplce.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdisplce.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,42 @@ +/* + * LWSDK Header File + * Copyright 1999, NewTek, Inc. + * + * LWDISPLCE.H -- LightWave Vertex Displacements + */ +#ifndef LWSDK_DISPLCE_H +#define LWSDK_DISPLCE_H + +#include <lwrender.h> +#include <lwmeshes.h> + +#define LWDISPLACEMENT_HCLASS "DisplacementHandler" +#define LWDISPLACEMENT_ICLASS "DisplacementInterface" +#define LWDISPLACEMENT_GCLASS "DisplacementGizmo" +#define LWDISPLACEMENT_VERSION 5 + + +typedef struct st_LWDisplacementAccess { + LWDVector oPos; + LWDVector source; + LWPntID point; + LWMeshInfo *info; + LWDVector wNorm; +} LWDisplacementAccess; + +typedef struct st_LWDisplacementHandler { + LWInstanceFuncs *inst; + LWItemFuncs *item; + LWRenderFuncs *rend; + void (*evaluate) (LWInstance, LWDisplacementAccess *); + unsigned int (*flags) (LWInstance); +} LWDisplacementHandler; + +#define LWDMF_WORLD (1<<0) +#define LWDMF_BEFOREBONES (1<<1) +#define LWDMF_AFTERMORPH (1<<2) +#define LWDMF_NEED_NORMALS (1<<3) +#define LWDMF_LAST (1<<4) + +#endif + Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdopetrack.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdopetrack.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdopetrack.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,169 @@ +/* + * LWSDK Header File + * Copyright 2004, NewTek, Inc. + * + * LWDOPETRACK.H -- Layout Dopetrack Interface + * + * This header contains declarations that allow a Tool-class plug-in + * to take over most of the functionality of the Layout Dopetrack + */ +#ifndef LWSDK_DOPETRACK_H +#define LWSDK_DOPETRACK_H + +#include <lwtypes.h> +#include <lwenvel.h> + +#define LWDOPETRACK_GLOBAL "Dopetrack Proxy" + +#ifndef RGB_ +#define RGB_(r,g,b) (((r) << 16) | ((b) << 8) | (g)) +#endif + +#define TIME_MARKER ((LWTime)99999.0) + +typedef enum +{ + DTOPMODE_CHANNEL = 0, + DTOPMODE_GLOBAL +} DTOperatingMode; + +typedef enum +{ + DTEVENT_KEYFUNCTION, + DTEVENT_EDITSTATECHANGE, + DTEVENT_BAKEZONECHANGE, + DTEVENT_UNDO, + DTEVENT_REDO +} DTEventType; + +typedef enum +{ + DTACTION_SELECT, + DTACTION_SHIFT, + DTACTION_SHIFT_COPY, + DTACTION_CREATE_KEY, + DTACTION_DELETE_KEY +} DTKeyAction; + +typedef enum +{ + DTMOUSE_DOWN, + DTMOUSE_MOVE, + DTMOUSE_UP +} DTMouseEvent; + +typedef struct _dtevent_mouse_st +{ + DTMouseEvent event; + int context; // 0=left margin, 1=right margin + int x,y; // relative to drawing area + int w,h; // dimensions of drawing area + int button; // 0=left, 1=right, 2=middle + int count; // click count: 1=single, 2=double, etc. +} DTMouseParam, *DTMouseParamID; + +typedef struct _dtevent_keyselect_st +{ + int count; + LWTime *indices; // list of time indices effected + LWTime offset; // shift offset of time indices (if DTACTION_SHIFT/DTACTION_SHIFT_COPY) +} DTKeySelect, *DTKeySelectID; + +typedef struct _dtevent_bakezone_st +{ + int count; + + // parallel arrays + int *start_frame,*end_frame; + LWTime *start_time,*end_time; + int *selected; +} DTBakeZone, *DTBakeZoneID; + +typedef struct _dteventparam_st +{ + DTEventType event; + int value; + LWTime offset; +} DTEventParam, *DTEventParamID; + +// menu management functions + +typedef int (*DTMenuCount)(int); +typedef int (*DTMenuSub)(int,int); +typedef int * (*DTMenuSep)(int); +typedef int (*DTMenuEnable)(int,int); +typedef const char * (*DTMenuItem)(int,int); +typedef void (*DTMenuSelect)(int,int); +typedef int (*DTMenuInitial)(void); + +// events on the dopetrack + +typedef void (*DTUserEvent)(DTEventParamID); +typedef int (*DTAllow)(DTKeyAction); +typedef void (*DTMouse)(DTMouseParamID); + +typedef struct _dtmenucallbacks +{ + DTMenuCount menuCount; + DTMenuSub menuSubMenu; + DTMenuSep menuSep; + DTMenuEnable menuEnable; + DTMenuItem menuItem; + DTMenuSelect menuSelect; + DTMenuInitial menuInitial; +} DTMenuCallbacks, *DTMenuCallbacksID; + +typedef struct _dttoolcallbacks +{ + DTUserEvent userEvent; + DTAllow allow; + DTMouse mouseEvent; + DTMenuCallbacks menu; +} DTToolCallbacks, *DTToolCallbacksID; + +typedef struct _dtdrawcallbacks +{ + int *(*context)(int side); // 0=left margin, 1=right margin + void (*erase)(int x,int y,int w,int h); + void (*pixel)(int x,int y,int color); // use RGB_() to construct color + void (*line)(int x1,int y1,int x2,int y2,int color); + void (*rectOutline)(int x,int y,int w,int h,int color); + void (*rectFilled)(int x,int y,int w,int h,int bcolor,int fcolor); + void (*border)(int x,int y,int w,int h); + void (*divider)(int x,int y,int w); + void (*text)(int x,int y,int color,const char *text); + void (*text_box)(int x,int y,int w,int h,const char *text); + void (*button)(int x,int y,int w,int h,int color); + void (*flush)(void); +} DTDrawFuncs, *DTDrawFuncsID; + +typedef struct st_LWDopetrackProxy +{ + void (*toolRegister)(DTToolCallbacksID); + void (*toolRelease)(void); + + void (*exposeEnvelopes)(LWEnvelopeID *,const char **,int *); + void (*refreshDisplay)(void); + + DTKeySelectID (*querySelectedKeys)(void); + void (*querySelection)(LWTime *,LWTime *); + + const LWTime *(*queryMarkers)(void); + void (*addMarker)(LWTime); + void (*remMarker)(LWTime); + + DTBakeZoneID (*queryBakeZones)(void); + void (*addBakeZone)(LWTime,LWTime); + void (*remBakeZone)(LWTime,LWTime); + + DTOperatingMode (*queryOpMode)(void); + + void (*displayMenu)(DTMenuCallbacksID); + + int (*visible)(void); + + DTDrawFuncs drawfuncs; +} LWDopetrackProxy, *LWDopetrackProxyID; + +#endif + Added: trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdyna.h =================================================================== --- trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdyna.h (rev 0) +++ trunk/LightwaveExport/deps/lwdsdk10.0/include/lwdyna.h 2011-06-22 16:58:34 UTC (rev 2980) @@ -0,0 +1,204 @@ +/* + * LWSDK Header File + * Copyright 1999, NewTek, Inc. + * + * LWDYNA.H -- LightWave DynaTypes + * + * This header defines the types and macros for simple DynaTypes. + */ +#ifndef LWSDK_DYNA_H +#define LWSDK_DYNA_H + +#include <stddef.h> +#include <lwmonitor.h> +#include <lwxpanel.h> + + +/* + * DynaType codes. + */ +typedef int DynaType; + +#define DY_NULL 0 +#define DY_STRING 1 +#define DY_INTEGER 2 +#define DY_FLOAT 3 +#define DY_DISTANCE 4 +#define DY_VINT 5 +#define DY_VFLOAT 6 +#define DY_VDIST 7 +#define DY_BOOLEAN 8 +#define DY_CHOICE 9 +#define DY_SURFACE 10 +#define DY_FONT 11 +#define DY_TEXT 12 +#define DY_LAYERS 13 +#define DY_CUSTOM 14 +#define DY_RANGE 15 +#define DY_LWITEM 16 +#define DY_PERCENT 17 +#define DY_POPUP 18 +#define DY_AREA 19 +#define DY_XPANEL 20 +#define DY_TREE 21 +#define DY_MLIST 22 +#define DY_POINTER 23 +#define DY__LAST DY_POINTER + + +/* + * DynaValue union. + */ +typedef struct st_DyValString { + DynaType type; + char *buf; + int bufLen; +} DyValString; + +typedef struct st_DyValInt { + DynaType type; + int value; + int defVal; +} DyValInt; + +typedef struct st_DyValFloat { + DynaType type; + double value; + double defVal; +} DyValFloat; + +typedef struct st_DyValIVector { + DynaType type; + int val[3]; + int defVal; +} DyValIVector; + +typedef struct st_DyValFVector { + DynaType type; + double val[3]; + double defVal; +} DyValFVector; + +typedef struct st_DyValCustom { + DynaType type; + size_t val[4]; +} DyValCustom; + +typedef struct st_DyValPointer { + DynaType type; + void *ptr; +} DyValPointer; + +typedef union un_DynaValue { + DynaType type; + DyValStr... [truncated message content] |
From: <si...@us...> - 2011-02-16 18:45:37
|
Revision: 2979 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2979&view=rev Author: sinbad Date: 2011-02-16 18:45:31 +0000 (Wed, 16 Feb 2011) Log Message: ----------- Fix Sketchup exporter on Mac OS X; should use '/' path separator in Ruby (works in Win32 too) and don't reset dialog variable as block is only modal on Windows. Modified Paths: -------------- trunk/sketchupexporter/ogre_export.rb Modified: trunk/sketchupexporter/ogre_export.rb =================================================================== --- trunk/sketchupexporter/ogre_export.rb 2010-11-23 01:48:19 UTC (rev 2978) +++ trunk/sketchupexporter/ogre_export.rb 2011-02-16 18:45:31 UTC (rev 2979) @@ -44,7 +44,7 @@ if p[-1,1] == "\\" or p[-1,1] == "/" p+f else - p+"\\"+f + p+"/"+f end end @@ -74,7 +74,6 @@ @@optionsDialog.add_action_callback("on_export") {|d,p| grabDialogData; saveConfig; export; d.close} @@optionsDialog.add_action_callback("on_cancel") {|d,p| d.close} } - @@optionsDialog = nil end def getDialogCheckbox(checkbox) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bel...@us...> - 2010-11-23 01:48:26
|
Revision: 2978 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2978&view=rev Author: bellyfish Date: 2010-11-23 01:48:19 +0000 (Tue, 23 Nov 2010) Log Message: ----------- * adding 6DofSpringConstraint patch. Thanks to snegovick: http://www.ogre3d.org/addonforums/viewtopic.php?f=12&t=13652 Modified Paths: -------------- trunk/ogrebullet/Demos/include/OgreBulletInputListener.h trunk/ogrebullet/Dynamics/include/Constraints/Makefile.am trunk/ogrebullet/Dynamics/scripts/VC8/OgreBulletDynamics_VC8.vcproj trunk/ogrebullet/Dynamics/src/Makefile.am Added Paths: ----------- trunk/ogrebullet/Dynamics/include/Constraints/OgreBulletDynamics6DofSpringConstraint.h trunk/ogrebullet/Dynamics/src/Constraints/OgreBulletDynamics6DofSpringConstraint.cpp Modified: trunk/ogrebullet/Demos/include/OgreBulletInputListener.h =================================================================== --- trunk/ogrebullet/Demos/include/OgreBulletInputListener.h 2010-11-15 21:39:06 UTC (rev 2977) +++ trunk/ogrebullet/Demos/include/OgreBulletInputListener.h 2010-11-23 01:48:19 UTC (rev 2978) @@ -32,7 +32,7 @@ #define BULLET_MOUSE_EVENT Ogre::MouseEvent* #define BULLET_KC Ogre::KC #define BULLET_LISTENER_IMPLEMENTATION_RETURN void - #define BULLET_LISTENER_IMPLEMENTATION_RETURN_CODE + #define BULLET_LISTENER_IMPLEMENTATION_RETURN_CODE #define BULLET_GETKEY e->getKey() @@ -46,14 +46,18 @@ #define BULLET_BUTTON2_UP e->getButtonID() == e->BUTTON2_MASK #define BULLET_GETRELX e->getRelX() - #define BULLET_GETRELY e->getRelY() + #define BULLET_GETRELY e->getRelY() #define BULLET_GETX e->getX() #define BULLET_GETY e->getY() #else // NOTICE: You may need to change this line to <OIS.h> if you build OIS from source. - #include "OIS\OIS.h" +#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 + #include "OIS.h" +#else + #include "OIS.h" +#endif namespace OIS { class Keyboard; @@ -92,10 +96,10 @@ /* The base Test class, is also able to listen for collisions and thus change the contact properties */ -class OgreBulletInputListener : +class OgreBulletInputListener : #if (OGRE_VERSION < ((1 << 16) | (3 << 8) | 0)) - public Ogre::MouseMotionListener, - public Ogre::MouseListener, + public Ogre::MouseMotionListener, + public Ogre::MouseListener, public Ogre::KeyListener #else public OIS::MouseListener, @@ -106,7 +110,7 @@ static const Ogre::Real KEY_DELAY; // Constructor/destructor - OgreBulletInputListener(OgreBulletListener * ogreBulletListener, + OgreBulletInputListener(OgreBulletListener * ogreBulletListener, Ogre::RenderWindow *win); virtual ~OgreBulletInputListener(){}; @@ -146,10 +150,10 @@ bool getButton1Pressed() const {return mButton1Pressed;} bool getButton2Pressed() const {return mButton2Pressed;} - + protected: - + Ogre::Real mRelX; Ogre::Real mRelY; Ogre::Real mMouseCursorX; Modified: trunk/ogrebullet/Dynamics/include/Constraints/Makefile.am =================================================================== --- trunk/ogrebullet/Dynamics/include/Constraints/Makefile.am 2010-11-15 21:39:06 UTC (rev 2977) +++ trunk/ogrebullet/Dynamics/include/Constraints/Makefile.am 2010-11-23 01:48:19 UTC (rev 2978) @@ -2,6 +2,7 @@ ogrebulletdynconstraintsinclude_HEADERS = \ OgreBulletDynamics6DofConstraint.h \ + OgreBulletDynamics6DofSpringConstraint.h \ OgreBulletDynamicsConeTwistConstraint.h \ OgreBulletDynamicsHingeConstraint.h \ OgreBulletDynamicsPoint2pointConstraint.h \ Added: trunk/ogrebullet/Dynamics/include/Constraints/OgreBulletDynamics6DofSpringConstraint.h =================================================================== --- trunk/ogrebullet/Dynamics/include/Constraints/OgreBulletDynamics6DofSpringConstraint.h (rev 0) +++ trunk/ogrebullet/Dynamics/include/Constraints/OgreBulletDynamics6DofSpringConstraint.h 2010-11-23 01:48:19 UTC (rev 2978) @@ -0,0 +1,76 @@ +/*************************************************************************** + +This source file is part of OGREBULLET +(Object-oriented Graphics Rendering Engine Bullet Wrapper) +For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10 + +Copyright (c) 2007 tua...@gm... (Use it Freely, even Statically, but have to contribute any changes) + + + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +----------------------------------------------------------------------------- +*/ + +#ifndef _OGREBULLETDYNAMICS_SixDofSpringConstraint_H +#define _OGREBULLETDYNAMICS_SixDofSpringConstraint_H + +#include "OgreBulletDynamicsPreRequisites.h" + +#include "OgreBulletDynamicsConstraint.h" + + +namespace OgreBulletDynamics +{ + // ------------------------------------------------------------------------- + // SixDofSpringConstraint class + class SixDofSpringConstraint : public TypedConstraint + { + public: + SixDofSpringConstraint(RigidBody * rbA, RigidBody * rbB, + const Ogre::Vector3& FrameInAVector, const Ogre::Quaternion& FrameInAOrientation, + const Ogre::Vector3& FrameInBVector, const Ogre::Quaternion& FrameInBOrientation); + + void setLinearLowerLimit(const Ogre::Vector3& linearLower); + void setLinearUpperLimit(const Ogre::Vector3& linearUpper); + void setAngularLowerLimit(const Ogre::Vector3& angularLower); + void setAngularUpperLimit(const Ogre::Vector3& angularUpper); + + void setLimit(const int axis, const Ogre::Real lo, const Ogre::Real hi); + + void enableSpring(int index, bool onOff); + void setStiffness(int index, const Ogre::Real stiffness); + void setDamping(int index, const Ogre::Real damping); + void setEquilibriumPoint(int index); + void setEquilibriumPoint(); + //! Test limit + /*! + - free means upper < lower, + - locked means upper == lower + - limited means upper > lower + - limitIndex: first 3 are linear, next 3 are angular + */ + bool isLimited(int limitIndex); + + virtual ~SixDofSpringConstraint(); + + }; +} +#endif //_OGREBULLETDYNAMICS_SixDofSpringConstraint_H + Property changes on: trunk/ogrebullet/Dynamics/include/Constraints/OgreBulletDynamics6DofSpringConstraint.h ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/ogrebullet/Dynamics/scripts/VC8/OgreBulletDynamics_VC8.vcproj =================================================================== --- trunk/ogrebullet/Dynamics/scripts/VC8/OgreBulletDynamics_VC8.vcproj 2010-11-15 21:39:06 UTC (rev 2977) +++ trunk/ogrebullet/Dynamics/scripts/VC8/OgreBulletDynamics_VC8.vcproj 2010-11-23 01:48:19 UTC (rev 2978) @@ -212,6 +212,10 @@ > </File> <File + RelativePath="..\..\src\Constraints\OgreBulletDynamics6DofSpringConstraint.cpp" + > + </File> + <File RelativePath="..\..\src\Constraints\OgreBulletDynamicsHingeConstraint.cpp" > </File> @@ -270,6 +274,10 @@ > </File> <File + RelativePath="..\..\include\Constraints\OgreBulletDynamics6DofSpringConstraint.h" + > + </File> + <File RelativePath="..\..\include\Constraints\OgreBulletDynamicsHingeConstraint.h" > </File> Added: trunk/ogrebullet/Dynamics/src/Constraints/OgreBulletDynamics6DofSpringConstraint.cpp =================================================================== --- trunk/ogrebullet/Dynamics/src/Constraints/OgreBulletDynamics6DofSpringConstraint.cpp (rev 0) +++ trunk/ogrebullet/Dynamics/src/Constraints/OgreBulletDynamics6DofSpringConstraint.cpp 2010-11-23 01:48:19 UTC (rev 2978) @@ -0,0 +1,120 @@ +/*************************************************************************** + +This source file is part of OGREBULLET +(Object-oriented Graphics Rendering Engine Bullet Wrapper) +For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10 + +Copyright (c) 2007 tua...@gm... (Use it Freely, even Statically, but have to contribute any changes) + + + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +----------------------------------------------------------------------------- +*/ + +#include "OgreBulletDynamics.h" + +#include "OgreBulletDynamicsWorld.h" +#include "OgreBulletDynamicsRigidBody.h" + +#include "OgreBulletDynamicsConstraint.h" +#include "Constraints/OgreBulletDynamics6DofSpringConstraint.h" + +using namespace Ogre; + +namespace OgreBulletDynamics +{ + // ------------------------------------------------------------------------- + SixDofSpringConstraint::SixDofSpringConstraint(RigidBody * rbA, RigidBody * rbB, + const Vector3& FrameInAVector3, const Quaternion& FrameInAOrientation, + const Vector3& FrameInBVector3, const Quaternion& FrameInBOrientation): + TypedConstraint(rbA, rbB) + { + btTransform frameInA (OgreBulletCollisions::OgreBtConverter::to (FrameInAOrientation), + OgreBulletCollisions::OgreBtConverter::to (FrameInAVector3)); + btTransform frameInB (OgreBulletCollisions::OgreBtConverter::to (FrameInBOrientation), + OgreBulletCollisions::OgreBtConverter::to (FrameInBVector3)); + + mConstraint = new btGeneric6DofSpringConstraint( + *rbA->getBulletRigidBody (), + *rbB->getBulletRigidBody (), + frameInA, + frameInB, + true); // Eric added this because Bullet 2.61 has a new argument (useLinearReferenceFrameA) + } + // ------------------------------------------------------------------------- + SixDofSpringConstraint::~SixDofSpringConstraint() + { + } + // ------------------------------------------------------------------------- + void SixDofSpringConstraint::setLinearLowerLimit(const Ogre::Vector3& linearLower) + { + static_cast<btGeneric6DofSpringConstraint* > (mConstraint)->setLinearLowerLimit(OgreBulletCollisions::OgreBtConverter::to (linearLower)); + } + // ------------------------------------------------------------------------- + void SixDofSpringConstraint::setLinearUpperLimit(const Ogre::Vector3& linearUpper) + { + static_cast<btGeneric6DofSpringConstraint* > (mConstraint)->setLinearLowerLimit(OgreBulletCollisions::OgreBtConverter::to (linearUpper)); + } + // ------------------------------------------------------------------------- + void SixDofSpringConstraint::setAngularLowerLimit(const Ogre::Vector3& angularLower) + { + static_cast<btGeneric6DofSpringConstraint* > (mConstraint)->setLinearLowerLimit(OgreBulletCollisions::OgreBtConverter::to (angularLower)); + } + // ------------------------------------------------------------------------- + void SixDofSpringConstraint::setAngularUpperLimit(const Ogre::Vector3& angularUpper) + { + static_cast<btGeneric6DofSpringConstraint* > (mConstraint)->setLinearLowerLimit(OgreBulletCollisions::OgreBtConverter::to (angularUpper)); + } + // ------------------------------------------------------------------------- + void SixDofSpringConstraint::setLimit(const int axis, const Ogre::Real lo, const Ogre::Real hi) + { + static_cast<btGeneric6DofSpringConstraint* > (mConstraint)->setLimit(axis, lo, hi); + } + // ------------------------------------------------------------------------- + bool SixDofSpringConstraint::isLimited(int limitIndex) + { + return static_cast<btGeneric6DofSpringConstraint* > (mConstraint)->isLimited(limitIndex); + } + // ------------------------------------------------------------------------- + void SixDofSpringConstraint::enableSpring(int index, bool onOff) + { + static_cast<btGeneric6DofSpringConstraint* > (mConstraint)->enableSpring(index, onOff); + } + // ------------------------------------------------------------------------- + void SixDofSpringConstraint::setStiffness(int index, const Ogre::Real stiffness) + { + static_cast<btGeneric6DofSpringConstraint* > (mConstraint)->setStiffness(index, stiffness); + } + // ------------------------------------------------------------------------- + void SixDofSpringConstraint::setDamping(int index, const Ogre::Real damping) + { + static_cast<btGeneric6DofSpringConstraint* > (mConstraint)->setStiffness(index, damping); + } + // ------------------------------------------------------------------------- + void SixDofSpringConstraint::setEquilibriumPoint(int index) + { + static_cast<btGeneric6DofSpringConstraint* > (mConstraint)->setEquilibriumPoint(index); + } + // ------------------------------------------------------------------------- + void SixDofSpringConstraint::setEquilibriumPoint() + { + static_cast<btGeneric6DofSpringConstraint* > (mConstraint)->setEquilibriumPoint(); + } +} Property changes on: trunk/ogrebullet/Dynamics/src/Constraints/OgreBulletDynamics6DofSpringConstraint.cpp ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/ogrebullet/Dynamics/src/Makefile.am =================================================================== --- trunk/ogrebullet/Dynamics/src/Makefile.am 2010-11-15 21:39:06 UTC (rev 2977) +++ trunk/ogrebullet/Dynamics/src/Makefile.am 2010-11-23 01:48:19 UTC (rev 2978) @@ -13,6 +13,7 @@ OgreBulletDynamicsRigidBody.cpp \ OgreBulletDynamicsWorld.cpp \ Constraints/OgreBulletDynamics6DofConstraint.cpp \ + Constraints/OgreBulletDynamics6DofSpringConstraint.cpp \ Constraints/OgreBulletDynamicsConeTwistConstraint.cpp \ Constraints/OgreBulletDynamicsHingeConstraint.cpp \ Constraints/OgreBulletDynamicsPoint2pointConstraint.cpp \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <es...@us...> - 2010-11-15 21:39:12
|
Revision: 2977 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2977&view=rev Author: esuvs Date: 2010-11-15 21:39:06 +0000 (Mon, 15 Nov 2010) Log Message: ----------- Better handling of when Ogre::Root cannot be created. Modified Paths: -------------- trunk/QtOgreFramework/QtOgre/source/Application.cpp Modified: trunk/QtOgreFramework/QtOgre/source/Application.cpp =================================================================== --- trunk/QtOgreFramework/QtOgre/source/Application.cpp 2010-11-13 13:16:29 UTC (rev 2976) +++ trunk/QtOgreFramework/QtOgre/source/Application.cpp 2010-11-15 21:39:06 UTC (rev 2977) @@ -101,7 +101,7 @@ mAutoUpdateTimer = new QTimer; QObject::connect(mAutoUpdateTimer, SIGNAL(timeout()), this, SLOT(update())); //On the test system, a value of one here gives a high frame rate and still allows - //event prcessing to take place. A value of 0 doubles the frame rate but the mouse + //event processing to take place. A value of 0 doubles the frame rate but the mouse //becomes jumpy. This property is configerable via setAutoUpdateInterval(). mAutoUpdateTimer->setInterval(1); @@ -113,14 +113,40 @@ //Logging should be initialised ASAP, and before Ogre::Root is created. initialiseLogging(); - //Create the root and load render system plugins. We do that here so that we know - //what render systems are available by the time we show the settings dialog. - //Note that the render system is not initialised until the user selects one. + //Create the Ogre::Root object. + qDebug("Creating Ogre::Root object..."); + try + { #ifdef QT_DEBUG - mRoot = new Ogre::Root("plugins_d.cfg"); + mRoot = new Ogre::Root("plugins_d.cfg"); #else - mRoot = new Ogre::Root("plugins.cfg"); + mRoot = new Ogre::Root("plugins.cfg"); #endif + qDebug("Ogre::Root created successfully."); + } + catch(Ogre::Exception& e) + { + QString error + ( + "Failed to create the Ogre::Root object. This is a fatal error and the " + "application will now exit. There are a few known reasons why this can occur:\n\n" + " 1) Ensure your plugins.cfg has the correct path to the plugins.\n" + " 2) In plugins.cfg, use unix style directorary serperators. I.e '/' rather than '\\'.\n" + " 3) If your plugins.cfg is trying to load the Direct3D plugin, make sure you have DirectX installed on your machine.\n\n" + "The message returned by Ogre was:\n\n" + ); + error += QString::fromStdString(e.getFullDescription().c_str()); + + qCritical(error.toAscii()); + showErrorMessageBox(error); + + //Not much else we can do here... + std::exit(1); + } + + //Load the render system plugins. We do that here so that we know what + //render systems are available by the time we show the settings dialog. + //Note that the render system is not initialised until the user selects one. mOpenGLRenderSystem = mRoot->getRenderSystemByName("OpenGL Rendering Subsystem"); mDirect3D9RenderSystem = mRoot->getRenderSystemByName("Direct3D9 Rendering Subsystem"); if(!(mOpenGLRenderSystem || mDirect3D9RenderSystem)) @@ -294,9 +320,7 @@ //Redirect Qt's logging system to our own mSystemLog = mLogManager->createLog("System"); qInstallMsgHandler(&qtMessageHandler); - qDebug("Debug test"); - qWarning("Warning test"); - qCritical("Critical test"); + qDebug("***System log initialised***"); //Redirect Ogre's logging system to our own //This has to all be done before creating the Root object. @@ -305,6 +329,8 @@ mInternalOgreLogManager = new Ogre::LogManager(); mInternalOgreLog = mInternalOgreLogManager->createLog("Ogre.log", false, true, true); mInternalOgreLog->addListener(this); + mOgreLog->logMessage("***Ogre log initialised and redirected by QtOgre framework.***", LL_DEBUG); + mOgreLog->logMessage("***Any further messages in this log come directly from Ogre.***", LL_DEBUG); } void Application::initialiseOgre(void) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <es...@us...> - 2010-11-13 13:16:35
|
Revision: 2976 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2976&view=rev Author: esuvs Date: 2010-11-13 13:16:29 +0000 (Sat, 13 Nov 2010) Log Message: ----------- Fixed some uninitialized variables. Modified Paths: -------------- trunk/QtOgreFramework/QtOgre/source/Application.cpp Modified: trunk/QtOgreFramework/QtOgre/source/Application.cpp =================================================================== --- trunk/QtOgreFramework/QtOgre/source/Application.cpp 2010-09-20 09:30:50 UTC (rev 2975) +++ trunk/QtOgreFramework/QtOgre/source/Application.cpp 2010-11-13 13:16:29 UTC (rev 2976) @@ -48,14 +48,27 @@ Application::Application(int& argc, char** argv, GameLogic* gameLogic, IgnoredConfigWarningMode ignoredConfigWarningMode) :QApplication(argc, argv) + ,mFPSDialog(0) + ,mGraphicsSettingsWidget(0) + ,mOgreWidget(0) + ,mSettingsDialog(0) + ,mInternalOgreLog(0) + ,mInternalOgreLogManager(0) + ,mLogManager(0) + ,mOgreLog(0) + ,mSystemLog(0) + ,mActiveRenderSystem(0) ,mOpenGLRenderSystem(0) ,mDirect3D9RenderSystem(0) + ,mRoot(0) ,mFrameCounter(0) + ,mGameLogic(gameLogic) + ,mAutoUpdateTimer(0) + ,mSettings(0) ,mAutoUpdateEnabled(true) ,mIsInitialised(false) ,mIgnoredConfigWarningMode(ignoredConfigWarningMode) { - mGameLogic = gameLogic; if(mGameLogic != 0) { mGameLogic->mApplication = this; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <m_...@us...> - 2010-09-20 09:30:57
|
Revision: 2975 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2975&view=rev Author: m_leber Date: 2010-09-20 09:30:50 +0000 (Mon, 20 Sep 2010) Log Message: ----------- Updated build configuration Modified Paths: -------------- trunk/stereoscopy/Demo_Fresnel/Fresnel.cpp trunk/stereoscopy/StereoManager.cpp trunk/stereoscopy/ogre1.6.vsprops trunk/stereoscopy/ogre1.7.vsprops Modified: trunk/stereoscopy/Demo_Fresnel/Fresnel.cpp =================================================================== --- trunk/stereoscopy/Demo_Fresnel/Fresnel.cpp 2010-09-18 16:28:00 UTC (rev 2974) +++ trunk/stereoscopy/Demo_Fresnel/Fresnel.cpp 2010-09-20 09:30:50 UTC (rev 2975) @@ -319,7 +319,7 @@ // get the resolution choosen with the config dialog ConfigOptionMap options = mRoot->getRenderSystem()->getConfigOptions(); String mode = options.find( "Video Mode" )->second.currentValue; - std::vector<String> tab = StringUtil::split(mode," x@"); + StringVector tab = StringUtil::split(mode," x@"); int w,h; w = StringConverter::parseInt(tab[0]); h = StringConverter::parseInt(tab[1]); Modified: trunk/stereoscopy/StereoManager.cpp =================================================================== --- trunk/stereoscopy/StereoManager.cpp 2010-09-18 16:28:00 UTC (rev 2974) +++ trunk/stereoscopy/StereoManager.cpp 2010-09-20 09:30:50 UTC (rev 2975) @@ -55,7 +55,9 @@ if(evt.source != mViewport) return; mCamera = mViewport->getCamera(); - assert(mCamera); + if(!mCamera) + return; + mStereoMgr->setCamera(mCamera); SceneManager *sceneMgr = mCamera->getSceneManager(); @@ -94,9 +96,9 @@ // update position mOldPos = mCamera->getPosition(); Vector3 pos = mOldPos; - pos += offset * mCamera->getRight(); mCamera->setPosition(pos); +// mCamera->moveRelative(Vector3(offset, 0, 0)); mStereoMgr->updateAllDependentRenderTargets(mIsLeftEye); mStereoMgr->chooseDebugPlaneMaterial(mIsLeftEye); @@ -107,6 +109,8 @@ if(evt.source != mViewport) return; + + if(!mStereoMgr->mIsCustomProjection) mCamera->setFrustumOffset(mOldOffset); else Modified: trunk/stereoscopy/ogre1.6.vsprops =================================================================== --- trunk/stereoscopy/ogre1.6.vsprops 2010-09-18 16:28:00 UTC (rev 2974) +++ trunk/stereoscopy/ogre1.6.vsprops 2010-09-20 09:30:50 UTC (rev 2975) @@ -14,11 +14,16 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if exist $(OGRE_SRC) copy "$(TargetPath)" "$(OGRE_SRC)\Samples\Common\Bin\$(ConfigurationName)"" + CommandLine="copy "$(TargetPath)" "$(OGRE_BIN)"" /> <UserMacro Name="OGRE_SRC" Value="D:\dev\okatra\ogre1.6.4" PerformEnvironmentSet="true" /> + <UserMacro + Name="OGRE_BIN" + Value="$(OGRE_SRC)\Samples\Common\Bin\$(ConfigurationName)" + PerformEnvironmentSet="true" + /> </VisualStudioPropertySheet> Modified: trunk/stereoscopy/ogre1.7.vsprops =================================================================== --- trunk/stereoscopy/ogre1.7.vsprops 2010-09-18 16:28:00 UTC (rev 2974) +++ trunk/stereoscopy/ogre1.7.vsprops 2010-09-20 09:30:50 UTC (rev 2975) @@ -6,11 +6,11 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(OGRE_SRC)\OgreMain\include";"$(OGRE_SRC)\Dependencies\include";"$(OGRE_SRC)\Samples\Common\include";"$(OGRE_BUILD)\include"" + AdditionalIncludeDirectories=""$(OGRE_HOME)\include\OGRE";"$(OGRE_HOME)\include";"$(OGRE_HOME)\Samples\Common\include";"C:\Program Files (x86)\boost\boost_1_42"" /> <Tool Name="VCLinkerTool" - AdditionalLibraryDirectories=""$(OGRE_BUILD)\lib\$(ConfigurationName)";"$(OGRE_SRC)\Dependencies\lib\$(ConfigurationName)"" + AdditionalLibraryDirectories=""$(OGRE_HOME)\lib\$(ConfigurationName)";"$(OGRE_HOME)\Dependencies\lib\$(ConfigurationName)";"C:\Program Files (x86)\boost\boost_1_42\lib"" /> <Tool Name="VCPostBuildEventTool" @@ -18,17 +18,11 @@ CommandLine="copy "$(TargetPath)" "$(OGRE_BIN)"" /> <UserMacro - Name="OGRE_SRC" - Value="D:\dev\OgreDev\ogre1.7.RC1" - PerformEnvironmentSet="true" + Name="OGRE_HOME" + Value="D:\dev\Dependencies\win32\ogre1.7.1sdk" /> <UserMacro - Name="OGRE_BUILD" - Value="D:\dev\OgreDev\ogre1.7.RC1\build" - PerformEnvironmentSet="true" - /> - <UserMacro Name="OGRE_BIN" - Value="$(OGRE_BUILD)\bin\$(ConfigurationName)" + Value="$(OGRE_HOME)\bin\$(ConfigurationName)" /> </VisualStudioPropertySheet> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sf...@us...> - 2010-09-18 16:28:07
|
Revision: 2974 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2974&view=rev Author: sfcbias Date: 2010-09-18 16:28:00 +0000 (Sat, 18 Sep 2010) Log Message: ----------- Renamed OgreNewt_Stdafx to reflect case sensitivity on Linux. Also Added dCustomJoints and dMath includes to CMakeLists.txt. Modified Paths: -------------- branches/ogrenewt/newton20/CMakeLists.txt Added Paths: ----------- branches/ogrenewt/.project branches/ogrenewt/newton20/inc/OgreNewt_stdafx.h branches/ogrenewt/newton20/src/OgreNewt_stdafx.cpp Removed Paths: ------------- branches/ogrenewt/newton20/inc/OgreNewt_Stdafx.h branches/ogrenewt/newton20/src/OgreNewt_Stdafx.cpp Added: branches/ogrenewt/.project =================================================================== --- branches/ogrenewt/.project (rev 0) +++ branches/ogrenewt/.project 2010-09-18 16:28:00 UTC (rev 2974) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>ogrenewt</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + </buildSpec> + <natures> + </natures> +</projectDescription> Property changes on: branches/ogrenewt/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: branches/ogrenewt/newton20/CMakeLists.txt =================================================================== --- branches/ogrenewt/newton20/CMakeLists.txt 2010-09-15 11:17:21 UTC (rev 2973) +++ branches/ogrenewt/newton20/CMakeLists.txt 2010-09-18 16:28:00 UTC (rev 2974) @@ -66,7 +66,9 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/inc ${OGRE_INCLUDE_DIRS} -${NEWTON_INCLUDE_DIR}) +${NEWTON_INCLUDE_DIR} +${NEWTON_INCLUDE_DIR}/dCustomJoints +${NEWTON_INCLUDE_DIR}/dMath) SET(OgreNewt_LIB_SRCS src/OgreNewt_BasicJoints.cpp @@ -120,4 +122,4 @@ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) ENDIF(NOT WIN32) -PRINT_ENABLED_FEATURES() +PRINT_ENABLED_FEATURES() \ No newline at end of file Deleted: branches/ogrenewt/newton20/inc/OgreNewt_Stdafx.h =================================================================== --- branches/ogrenewt/newton20/inc/OgreNewt_Stdafx.h 2010-09-15 11:17:21 UTC (rev 2973) +++ branches/ogrenewt/newton20/inc/OgreNewt_Stdafx.h 2010-09-18 16:28:00 UTC (rev 2974) @@ -1,52 +0,0 @@ -#ifndef _INCLUDE_OGRE_STDAFX_ -#define _INCLUDE_OGRE_STDAFX_ - - -#ifdef _MSC_VER - #include <Ogre.h> - #include <OgreRoot.h> - #include <OgreVector3.h> - #include <OgreQuaternion.h> - #include <OgreMovableObject.h> - #include <OgreRenderable.h> - #include <OgreNode.h> - #include <OgreFrameListener.h> - #include <OgreEntity.h> - #include <OgreSubMesh.h> - #include <OgreSceneNode.h> - #include <OgreLogManager.h> - #include <OgreStringConverter.h> - #include <OgreRenderWindow.h> - #include <OgreSceneNode.h> - #include <OgreSceneManager.h> - #include <OgreManualObject.h> - #include <OgreFontManager.h> - #include <OgreMaterialManager.h> - #include <OgreCamera.h> - #include <OgreHardwareBufferManager.h> - - #ifndef OGRENEWT_NO_OGRE_ANY - #include <OgreAny.h> - #endif - - #ifdef _DEBUG - #include <OgreLogManager.h> - #include <OgreStringConverter.h> - #endif - - #include <Newton.h> - #include <dVector.h> - #include <dMatrix.h> - #include <dQuaternion.h> - #include <NewtonCustomJoint.h> - - #include <boost/function.hpp> - #include <boost/bind.hpp> - - #ifndef OGRENEWT_NO_COLLISION_SHAREDPTR - # include <boost/shared_ptr.hpp> - #endif - -#endif - -#endif Copied: branches/ogrenewt/newton20/inc/OgreNewt_stdafx.h (from rev 2973, branches/ogrenewt/newton20/inc/OgreNewt_Stdafx.h) =================================================================== --- branches/ogrenewt/newton20/inc/OgreNewt_stdafx.h (rev 0) +++ branches/ogrenewt/newton20/inc/OgreNewt_stdafx.h 2010-09-18 16:28:00 UTC (rev 2974) @@ -0,0 +1,52 @@ +#ifndef _INCLUDE_OGRE_STDAFX_ +#define _INCLUDE_OGRE_STDAFX_ + + +#ifdef _MSC_VER + #include <Ogre.h> + #include <OgreRoot.h> + #include <OgreVector3.h> + #include <OgreQuaternion.h> + #include <OgreMovableObject.h> + #include <OgreRenderable.h> + #include <OgreNode.h> + #include <OgreFrameListener.h> + #include <OgreEntity.h> + #include <OgreSubMesh.h> + #include <OgreSceneNode.h> + #include <OgreLogManager.h> + #include <OgreStringConverter.h> + #include <OgreRenderWindow.h> + #include <OgreSceneNode.h> + #include <OgreSceneManager.h> + #include <OgreManualObject.h> + #include <OgreFontManager.h> + #include <OgreMaterialManager.h> + #include <OgreCamera.h> + #include <OgreHardwareBufferManager.h> + + #ifndef OGRENEWT_NO_OGRE_ANY + #include <OgreAny.h> + #endif + + #ifdef _DEBUG + #include <OgreLogManager.h> + #include <OgreStringConverter.h> + #endif + + #include <Newton.h> + #include <dVector.h> + #include <dMatrix.h> + #include <dQuaternion.h> + #include <NewtonCustomJoint.h> + + #include <boost/function.hpp> + #include <boost/bind.hpp> + + #ifndef OGRENEWT_NO_COLLISION_SHAREDPTR + # include <boost/shared_ptr.hpp> + #endif + +#endif + +#endif Deleted: branches/ogrenewt/newton20/src/OgreNewt_Stdafx.cpp =================================================================== --- branches/ogrenewt/newton20/src/OgreNewt_Stdafx.cpp 2010-09-15 11:17:21 UTC (rev 2973) +++ branches/ogrenewt/newton20/src/OgreNewt_Stdafx.cpp 2010-09-18 16:28:00 UTC (rev 2974) @@ -1,2 +0,0 @@ -#include "OgreNewt_stdafx.h" - Copied: branches/ogrenewt/newton20/src/OgreNewt_stdafx.cpp (from rev 2973, branches/ogrenewt/newton20/src/OgreNewt_Stdafx.cpp) =================================================================== --- branches/ogrenewt/newton20/src/OgreNewt_stdafx.cpp (rev 0) +++ branches/ogrenewt/newton20/src/OgreNewt_stdafx.cpp 2010-09-18 16:28:00 UTC (rev 2974) @@ -0,0 +1,2 @@ +#include "OgreNewt_stdafx.h" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kal...@us...> - 2010-09-15 11:17:27
|
Revision: 2973 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2973&view=rev Author: kallaspriit Date: 2010-09-15 11:17:21 +0000 (Wed, 15 Sep 2010) Log Message: ----------- Updated library dir ignore list. Property Changed: ---------------- branches/ogrenewt/newton20/lib/ Property changes on: branches/ogrenewt/newton20/lib ___________________________________________________________________ Added: svn:ignore + *.exp *.idb *.pdb This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kal...@us...> - 2010-09-15 11:16:32
|
Revision: 2972 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2972&view=rev Author: kallaspriit Date: 2010-09-15 11:16:25 +0000 (Wed, 15 Sep 2010) Log Message: ----------- Added OgreNewt lib and dll files to repo. Added Paths: ----------- branches/ogrenewt/newton20/lib/ branches/ogrenewt/newton20/lib/OgreNewt.dll branches/ogrenewt/newton20/lib/OgreNewt.lib Property Changed: ---------------- branches/ogrenewt/newton20/ Property changes on: branches/ogrenewt/newton20 ___________________________________________________________________ Modified: svn:ignore - *.ncb *.opensdf *.sdf *.user ipch lib obj + *.ncb *.opensdf *.sdf *.user ipch obj Added: branches/ogrenewt/newton20/lib/OgreNewt.dll =================================================================== (Binary files differ) Property changes on: branches/ogrenewt/newton20/lib/OgreNewt.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/ogrenewt/newton20/lib/OgreNewt.lib =================================================================== (Binary files differ) Property changes on: branches/ogrenewt/newton20/lib/OgreNewt.lib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <es...@us...> - 2010-09-14 19:29:15
|
Revision: 2971 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2971&view=rev Author: esuvs Date: 2010-09-14 19:29:09 +0000 (Tue, 14 Sep 2010) Log Message: ----------- Exposed getLogByName function to application. Modified Paths: -------------- trunk/QtOgreFramework/QtOgre/include/Application.h trunk/QtOgreFramework/QtOgre/source/Application.cpp Modified: trunk/QtOgreFramework/QtOgre/include/Application.h =================================================================== --- trunk/QtOgreFramework/QtOgre/include/Application.h 2010-09-13 19:37:48 UTC (rev 2970) +++ trunk/QtOgreFramework/QtOgre/include/Application.h 2010-09-14 19:29:09 UTC (rev 2971) @@ -88,6 +88,8 @@ //@{ ///Creates a new log with a given name. Log* createLog(const QString& name); + ///Get the log with the specified name. + Log* getLogByName(const QString& name); ///Adds a new page to the settings dialog void addSettingsWidget(const QString& title, AbstractSettingsWidget* settingsWidget); //@} Modified: trunk/QtOgreFramework/QtOgre/source/Application.cpp =================================================================== --- trunk/QtOgreFramework/QtOgre/source/Application.cpp 2010-09-13 19:37:48 UTC (rev 2970) +++ trunk/QtOgreFramework/QtOgre/source/Application.cpp 2010-09-14 19:29:09 UTC (rev 2971) @@ -428,9 +428,16 @@ //////////////////////////////////////////////////////////////////////////////// Log* Application::createLog(const QString& name) { + //Forward the request to the LogManager. return mLogManager->createLog(name); } + Log* Application::getLogByName(const QString& name) + { + //Forward the request to the LogManager. + return mLogManager->getLogByName(name); + } + void Application::hideLogManager(void) { mLogManager->setVisible(false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kal...@us...> - 2010-09-13 19:37:54
|
Revision: 2970 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2970&view=rev Author: kallaspriit Date: 2010-09-13 19:37:48 +0000 (Mon, 13 Sep 2010) Log Message: ----------- Fixed a scaling issue. Modified Paths: -------------- branches/ogrenewt/newton20/OgreNewt_VS9.suo branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp Modified: branches/ogrenewt/newton20/OgreNewt_VS9.suo =================================================================== (Binary files differ) Modified: branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp =================================================================== --- branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp 2010-09-09 19:50:14 UTC (rev 2969) +++ branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp 2010-09-13 19:37:48 UTC (rev 2970) @@ -129,8 +129,9 @@ Ogre::MeshPtr mesh = obj->getMesh(); // get scale, if attached to node - Ogre::Node * node = obj->getParentNode(); - if (node) scale = node->getScale(); + Ogre::Node * node = obj->getParentNode(); + if (node) scale = node->_getDerivedScale(); + if (forceScale != Ogre::Vector3::ZERO) scale = forceScale; //find number of submeshes @@ -267,7 +268,7 @@ // get scale, if attached to node Ogre::Node * node = obj->getParentNode(); - if (node) scale = node->getScale(); + if (node) scale = node->_getDerivedScale(); //find number of sub-meshes unsigned short sub = mesh->getNumSubMeshes(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bel...@us...> - 2010-09-09 19:50:20
|
Revision: 2969 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2969&view=rev Author: bellyfish Date: 2010-09-09 19:50:14 +0000 (Thu, 09 Sep 2010) Log Message: ----------- * Added missing limits.h Modified Paths: -------------- trunk/ogrebullet/Collisions/src/OgreBulletCollisionsWorld.cpp Modified: trunk/ogrebullet/Collisions/src/OgreBulletCollisionsWorld.cpp =================================================================== --- trunk/ogrebullet/Collisions/src/OgreBulletCollisionsWorld.cpp 2010-09-09 17:19:43 UTC (rev 2968) +++ trunk/ogrebullet/Collisions/src/OgreBulletCollisionsWorld.cpp 2010-09-09 19:50:14 UTC (rev 2969) @@ -28,6 +28,8 @@ ----------------------------------------------------------------------------- */ +#include <limits.h> + #include "OgreBulletCollisions.h" #include "Debug/OgreBulletCollisionsDebugDrawer.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kal...@us...> - 2010-09-09 17:19:50
|
Revision: 2968 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2968&view=rev Author: kallaspriit Date: 2010-09-09 17:19:43 +0000 (Thu, 09 Sep 2010) Log Message: ----------- Fixed node updating as reported by Nodrev http://www.ogre3d.org/addonforums/viewtopic.php?f=4&t=13387&sid=0644c76940fafbbded881e13a3e8a06f Modified Paths: -------------- branches/ogrenewt/newton20/OgreNewt.vcproj branches/ogrenewt/newton20/OgreNewt_VS9.suo branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcproj branches/ogrenewt/newton20/src/OgreNewt_Body.cpp Modified: branches/ogrenewt/newton20/OgreNewt.vcproj =================================================================== --- branches/ogrenewt/newton20/OgreNewt.vcproj 2010-09-08 18:40:56 UTC (rev 2967) +++ branches/ogrenewt/newton20/OgreNewt.vcproj 2010-09-09 17:19:43 UTC (rev 2968) @@ -112,7 +112,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="copy $(OutDir)\OgreNewt_d.dll demos\bin\Debug\OgreNewt_d.dll


if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" "demos\bin\Debug\OgreMain_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" "demos\bin\Debug\OIS_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" "demos\bin\Debug\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" "demos\bin\Debug\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" "demos\bin\Debug\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreGUIRenderer_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreGUIRenderer_d.dll" "demos\bin\Debug\OgreGUIRenderer_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIBase_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIBase_d.dll" "demos\bin\Debug\CEGUIBase_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIExpatParser_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIExpatParser_d.dll" "demos\bin\Debug\CEGUIExpatParser_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" "demos\bin\Debug\cg.dll"

if exist "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" copy "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" "demos\bin\Debug\OgreMain_d.dll"
if exist "$(OGRE_HOME)\bin\debug\OIS_d.dll" copy "$(OGRE_HOME)\bin\debug\OIS_d.dll" demos\bin\Debug\OIS_d.dll"
if exist "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" demos\bin\Debug\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" demos\bin\Debug\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" demos\bin\Debug\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\bin\debug\OgreGUIRenderer_d.dll" copy "$(OGRE_HOME)\bin\debug\OgreGUIRenderer_d.dll" demos\bin\Debug\OgreGUIRenderer_d.dll"
if exist "$(OGRE_HOME)\bin\debug\CEGUIBase_d.dll" copy "$(OGRE_HOME)\bin\debug\CEGUIBase_d.dll" demos\bin\Debug\CEGUIBase_d.dll"
if exist "$(OGRE_HOME)\bin\debug\CEGUIExpatParser_d.dll" copy "$(OGRE_HOME)\bin\debug\CEGUIExpatParser_d.dll" demos\bin\Debug\CEGUIExpatParser_d.dll"
if exist "$(OGRE_HOME)\bin\debug\cg.dll" copy "$(OGRE_HOME)\bin\debug\cg.dll" demos\bin\Debug\cg.dll"

if exist "$(OGRE_BUILD_HOME)\bin\release\OgreMain_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OgreMain_d.dll" "demos\bin\Release\OgreMain_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\OIS.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\Plugin_CgProgramManager_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\Plugin_CgProgramManager_d.dll" "demos\bin\Release\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_Direct3D9_d.dll" "demos\bin\Release\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_GL_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_GL_d.dll" "demos\bin\Release\RenderSystem_GL_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\OgreGUIRenderer_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OgreGUIRenderer_d.dll" "demos\bin\Release\OgreGUIRenderer_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\CEGUIBase_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\CEGUIBase_d.dll" "demos\bin\Release\CEGUIBase_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\CEGUIExpatParser_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\CEGUIExpatParser_d.dll" "demos\bin\Release\CEGUIExpatParser_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\cg.dll" copy "$(OGRE_BUILD_HOME)\bin\release\cg.dll" "demos\bin\Release\cg.dll"

copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll demos\bin\Debug\newton.dll
copy $(NEWTON_HOME)\sdk\x32\dJointLibrary_d.dll demos\bin\Debug\dJointLibrary_d.dll

" + CommandLine="copy $(OutDir)\OgreNewt_d.dll demos\bin\Debug\OgreNewt_d.dll


if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" "demos\bin\Debug\OgreMain_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" "demos\bin\Debug\OIS_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" "demos\bin\Debug\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" "demos\bin\Debug\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" "demos\bin\Debug\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreGUIRenderer_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreGUIRenderer_d.dll" "demos\bin\Debug\OgreGUIRenderer_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIBase_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIBase_d.dll" "demos\bin\Debug\CEGUIBase_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIExpatParser_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIExpatParser_d.dll" "demos\bin\Debug\CEGUIExpatParser_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" "demos\bin\Debug\cg.dll"

if exist "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" copy "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" "demos\bin\Debug\OgreMain_d.dll"
if exist "$(OGRE_HOME)\bin\debug\OIS_d.dll" copy "$(OGRE_HOME)\bin\debug\OIS_d.dll" demos\bin\Debug\OIS_d.dll"
if exist "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" demos\bin\Debug\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" demos\bin\Debug\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" demos\bin\Debug\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\bin\debug\OgreGUIRenderer_d.dll" copy "$(OGRE_HOME)\bin\debug\OgreGUIRenderer_d.dll" demos\bin\Debug\OgreGUIRenderer_d.dll"
if exist "$(OGRE_HOME)\bin\debug\CEGUIBase_d.dll" copy "$(OGRE_HOME)\bin\debug\CEGUIBase_d.dll" demos\bin\Debug\CEGUIBase_d.dll"
if exist "$(OGRE_HOME)\bin\debug\CEGUIExpatParser_d.dll" copy "$(OGRE_HOME)\bin\debug\CEGUIExpatParser_d.dll" demos\bin\Debug\CEGUIExpatParser_d.dll"
if exist "$(OGRE_HOME)\bin\debug\cg.dll" copy "$(OGRE_HOME)\bin\debug\cg.dll" demos\bin\Debug\cg.dll"

if exist "$(OGRE_BUILD_HOME)\bin\debug\OgreMain_d.dll" copy "$(OGRE_BUILD_HOME)\bin\debug\OgreMain_d.dll" "demos\bin\Release\OgreMain_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\debug\OIS.dll" copy "$(OGRE_BUILD_HOME)\bin\debug\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_BUILD_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_BUILD_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" "demos\bin\Release\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_BUILD_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" "demos\bin\Release\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\debug\RenderSystem_GL_d.dll" copy "$(OGRE_BUILD_HOME)\bin\debug\RenderSystem_GL_d.dll" "demos\bin\Release\RenderSystem_GL_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\debug\OgreGUIRenderer_d.dll" copy "$(OGRE_BUILD_HOME)\bin\debug\OgreGUIRenderer_d.dll" "demos\bin\Release\OgreGUIRenderer_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\debug\CEGUIBase_d.dll" copy "$(OGRE_BUILD_HOME)\bin\debug\CEGUIBase_d.dll" "demos\bin\Release\CEGUIBase_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\debug\CEGUIExpatParser_d.dll" copy "$(OGRE_BUILD_HOME)\bin\debug\CEGUIExpatParser_d.dll" "demos\bin\Release\CEGUIExpatParser_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\debug\cg.dll" copy "$(OGRE_BUILD_HOME)\bin\debug\cg.dll" "demos\bin\Release\cg.dll"

copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll demos\bin\Debug\newton.dll
copy $(NEWTON_HOME)\sdk\x32\dJointLibrary_d.dll demos\bin\Debug\dJointLibrary_d.dll

" /> </Configuration> <Configuration Modified: branches/ogrenewt/newton20/OgreNewt_VS9.suo =================================================================== (Binary files differ) Modified: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcproj =================================================================== --- branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcproj 2010-09-08 18:40:56 UTC (rev 2967) +++ branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcproj 2010-09-09 17:19:43 UTC (rev 2968) @@ -25,7 +25,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="copy ..\..\lib\OgreNewt_d.dll $(OutDir)\OgreNewt_d.dll

if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" "$(OutDir)\OgreMain_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" "$(OutDir)\OIS_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" "$(OutDir)\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" "$(OutDir)\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" "$(OutDir)\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" "$(OutDir)\cg.dll"

if exist "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" copy "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" "$(OutDir)\OgreMain_d.dll"
if exist "$(OGRE_HOME)\bin\debug\OIS_d.dll" copy "$(OGRE_HOME)\bin\debug\OIS_d.dll" demos\bin\Debug\OIS_d.dll"
if exist "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" demos\bin\Debug\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" demos\bin\Debug\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" demos\bin\Debug\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\bin\debug\cg.dll" copy "$(OGRE_HOME)\bin\debug\cg.dll" demos\bin\Debug\cg.dll"

if exist "$(OGRE_BUILD_HOME)\bin\release\OgreMain_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OgreMain_d.dll" "demos\bin\Release\OgreMain_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\OIS.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\Plugin_CgProgramManager_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\Plugin_CgProgramManager_d.dll" "demos\bin\Release\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_Direct3D9_d.dll" "demos\bin\Release\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_GL_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_GL_d.dll" "demos\bin\Release\RenderSystem_GL_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\cg.dll" copy "$(OGRE_BUILD_HOME)\bin\release\cg.dll" "demos\bin\Release\cg.dll"

copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll $(OutDir)\newton.dll
copy $(NEWTON_HOME)\sdk\x32\dJointLibrary_d.dll $(OutDir)\dJointLibrary_d.dll
" + CommandLine="copy ..\..\lib\OgreNewt_d.dll $(OutDir)\OgreNewt_d.dll

if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" "$(OutDir)\OgreMain_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" "$(OutDir)\OIS_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" "$(OutDir)\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" "$(OutDir)\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" "$(OutDir)\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" "$(OutDir)\cg.dll"

if exist "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" copy "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" "$(OutDir)\OgreMain_d.dll"
if exist "$(OGRE_HOME)\bin\debug\OIS_d.dll" copy "$(OGRE_HOME)\bin\debug\OIS_d.dll" demos\bin\Debug\OIS_d.dll"
if exist "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" demos\bin\Debug\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" demos\bin\Debug\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" demos\bin\Debug\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\bin\debug\cg.dll" copy "$(OGRE_HOME)\bin\debug\cg.dll" demos\bin\Debug\cg.dll"

if exist "$(OGRE_BUILD_HOME)\bin\debug\OgreMain_d.dll" copy "$(OGRE_BUILD_HOME)\bin\debug\OgreMain_d.dll" "demos\bin\Release\OgreMain_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\debug\OIS.dll" copy "$(OGRE_BUILD_HOME)\bin\debug\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_BUILD_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_BUILD_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" "demos\bin\Release\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_BUILD_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" "demos\bin\Release\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\debug\RenderSystem_GL_d.dll" copy "$(OGRE_BUILD_HOME)\bin\debug\RenderSystem_GL_d.dll" "demos\bin\Release\RenderSystem_GL_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\debug\cg.dll" copy "$(OGRE_BUILD_HOME)\bin\debug\cg.dll" "demos\bin\Release\cg.dll"

copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll $(OutDir)\newton.dll
copy $(NEWTON_HOME)\sdk\x32\dJointLibrary_d.dll $(OutDir)\dJointLibrary_d.dll
" /> <Tool Name="VCCustomBuildTool" Modified: branches/ogrenewt/newton20/src/OgreNewt_Body.cpp =================================================================== --- branches/ogrenewt/newton20/src/OgreNewt_Body.cpp 2010-09-08 18:40:56 UTC (rev 2967) +++ branches/ogrenewt/newton20/src/OgreNewt_Body.cpp 2010-09-09 17:19:43 UTC (rev 2968) @@ -484,9 +484,13 @@ #ifndef WIN32 m_world->ogreCriticalSectionLock(); #endif - m_node->setPosition(m_nodePosit); - m_node->setOrientation(m_nodeRotation); + // Set position in global space + Ogre::Node* m_nodeParent = m_node->getParent(); + + m_node->setPosition((m_nodeParent->_getDerivedOrientation().Inverse() * (m_nodePosit - m_nodeParent->_getDerivedPosition()) / m_nodeParent->_getDerivedScale())); + m_node->setOrientation((m_nodeParent->_getDerivedOrientation().Inverse() * m_nodeRotation)); + if (m_nodeupdatenotifycallback) { m_nodeupdatenotifycallback (this); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <es...@us...> - 2010-09-08 18:41:03
|
Revision: 2967 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2967&view=rev Author: esuvs Date: 2010-09-08 18:40:56 +0000 (Wed, 08 Sep 2010) Log Message: ----------- Improved Mac support. Modified Paths: -------------- trunk/QtOgreFramework/QtOgre/source/OgreWidget.cpp Modified: trunk/QtOgreFramework/QtOgre/source/OgreWidget.cpp =================================================================== --- trunk/QtOgreFramework/QtOgre/source/OgreWidget.cpp 2010-09-07 02:07:49 UTC (rev 2966) +++ trunk/QtOgreFramework/QtOgre/source/OgreWidget.cpp 2010-09-08 18:40:56 UTC (rev 2967) @@ -55,7 +55,7 @@ //Accept input focus setFocusPolicy(Qt::StrongFocus); - #if defined(Q_WS_WIN) + #if defined(Q_WS_WIN) || defined(Q_WS_MAC) //positive integer for W32 (HWND handle) - According to Ogre Docs externalWindowHandleParams = Ogre::StringConverter::toString((unsigned int)(winId())); #endif @@ -73,7 +73,7 @@ #endif //Add the external window handle parameters to the existing params set. - #if defined(Q_WS_WIN) + #if defined(Q_WS_WIN) || defined(Q_WS_MAC) params["externalWindowHandle"] = externalWindowHandleParams; #endif @@ -81,6 +81,11 @@ params["parentWindowHandle"] = externalWindowHandleParams; #endif + #if defined(Q_WS_MAC) + params["macAPI"] = "cocoa"; + params["macAPICocoaUseNSView"] = "true"; + #endif + //Finally create our window. m_pOgreRenderWindow = Ogre::Root::getSingletonPtr()->createRenderWindow("OgreWindow", width(), height(), false, ¶ms); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bel...@us...> - 2010-09-07 02:07:56
|
Revision: 2966 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2966&view=rev Author: bellyfish Date: 2010-09-07 02:07:49 +0000 (Tue, 07 Sep 2010) Log Message: ----------- * Add missing media file and update resources.cfg Modified Paths: -------------- trunk/ogrebullet/Demos/resources.cfg Added Paths: ----------- trunk/ogrebullet/Demos/Media/terrain.cfg Added: trunk/ogrebullet/Demos/Media/terrain.cfg =================================================================== --- trunk/ogrebullet/Demos/Media/terrain.cfg (rev 0) +++ trunk/ogrebullet/Demos/Media/terrain.cfg 2010-09-07 02:07:49 UTC (rev 2966) @@ -0,0 +1,71 @@ +# The main world texture (if you wish the terrain manager to create a material for you) +WorldTexture=terrain_texture.jpg + +# The detail texture (if you wish the terrain manager to create a material for you) +DetailTexture=terrain_detail.jpg + +#number of times the detail texture will tile in a terrain tile +DetailTile=3 + +# Heightmap source +PageSource=Heightmap + +# Heightmap-source specific settings +Heightmap.image=terrain.png + +# If you use RAW, fill in the below too +# RAW-specific setting - size (horizontal/vertical) +#Heightmap.raw.size=513 +# RAW-specific setting - bytes per pixel (1 = 8bit, 2=16bit) +#Heightmap.raw.bpp=2 + +# How large is a page of tiles (in vertices)? Must be (2^n)+1 +PageSize=513 + +# How large is each tile? Must be (2^n)+1 and be smaller than PageSize +TileSize=65 + +# The maximum error allowed when determining which LOD to use +MaxPixelError=3 + +# The size of a terrain page, in world units +PageWorldX=1500 +PageWorldZ=1500 +# Maximum height of the terrain +MaxHeight=100 + +# Upper LOD limit +MaxMipMapLevel=5 + +#VertexNormals=yes +#VertexColors=yes +#UseTriStrips=yes + +# Use vertex program to morph LODs, if available +VertexProgramMorph=yes + +# The proportional distance range at which the LOD morph starts to take effect +# This is as a proportion of the distance between the current LODs effective range, +# and the effective range of the next lower LOD +LODMorphStart=0.2 + +# This following section is for if you want to provide your own terrain shading routine +# Note that since you define your textures within the material this makes the +# WorldTexture and DetailTexture settings redundant + +# The name of the vertex program parameter you wish to bind the morph LOD factor to +# this is 0 when there is no adjustment (highest) to 1 when the morph takes it completely +# to the same position as the next lower LOD +# USE THIS IF YOU USE HIGH-LEVEL VERTEX PROGRAMS WITH LOD MORPHING +#MorphLODFactorParamName=morphFactor + +# The index of the vertex program parameter you wish to bind the morph LOD factor to +# this is 0 when there is no adjustment (highest) to 1 when the morph takes it completely +# to the same position as the next lower LOD +# USE THIS IF YOU USE ASSEMBLER VERTEX PROGRAMS WITH LOD MORPHING +#MorphLODFactorParamIndex=4 + +# The name of the material you will define to shade the terrain +#CustomMaterialName=TestTerrainMaterial + + Modified: trunk/ogrebullet/Demos/resources.cfg =================================================================== --- trunk/ogrebullet/Demos/resources.cfg 2010-09-01 20:03:48 UTC (rev 2965) +++ trunk/ogrebullet/Demos/resources.cfg 2010-09-07 02:07:49 UTC (rev 2966) @@ -5,6 +5,7 @@ # Resource locations to be added to the default path [General] +FileSystem=Media\ FileSystem=Media\fonts FileSystem=Media\materials/programs FileSystem=Media\materials/scripts @@ -14,8 +15,8 @@ FileSystem=Media\particle FileSystem=Media\gui - -[OgreBullet] +[Bullet] FileSystem=Media\OgreBullet FileSystem=Media\materials -FileSystem=Media\textures \ No newline at end of file +FileSystem=Media\textures + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <es...@us...> - 2010-09-01 20:03:54
|
Revision: 2965 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2965&view=rev Author: esuvs Date: 2010-09-01 20:03:48 +0000 (Wed, 01 Sep 2010) Log Message: ----------- Changed FPSDialog to use ToolTip rather than FramelessWindowHint. Modified Paths: -------------- trunk/QtOgreFramework/QtOgre/source/Application.cpp Modified: trunk/QtOgreFramework/QtOgre/source/Application.cpp =================================================================== --- trunk/QtOgreFramework/QtOgre/source/Application.cpp 2010-08-26 13:23:29 UTC (rev 2964) +++ trunk/QtOgreFramework/QtOgre/source/Application.cpp 2010-09-01 20:03:48 UTC (rev 2965) @@ -240,7 +240,7 @@ Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups(); } - mFPSDialog = new FPSDialog(mOgreWidget, Qt::FramelessWindowHint); + mFPSDialog = new FPSDialog(mOgreWidget, Qt::ToolTip); mFPSDialog->setWindowOpacity(settings()->value("System/DefaultWindowOpacity", 1.0).toDouble()); mFPSDialog->move(mainWidget()->geometry().topLeft() + QPoint(10,10)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kal...@us...> - 2010-08-26 13:23:36
|
Revision: 2964 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2964&view=rev Author: kallaspriit Date: 2010-08-26 13:23:29 +0000 (Thu, 26 Aug 2010) Log Message: ----------- Updated project files to use dJointLibrary instead of JointLibrary (renamed by Julio). Modified Paths: -------------- branches/ogrenewt/newton20/OgreNewt.vcproj branches/ogrenewt/newton20/OgreNewt.vcxproj branches/ogrenewt/newton20/OgreNewt_VS9.suo branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcproj branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcxproj branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS9.suo Modified: branches/ogrenewt/newton20/OgreNewt.vcproj =================================================================== --- branches/ogrenewt/newton20/OgreNewt.vcproj 2010-08-25 09:40:46 UTC (rev 2963) +++ branches/ogrenewt/newton20/OgreNewt.vcproj 2010-08-26 13:23:29 UTC (rev 2964) @@ -80,7 +80,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions=" /STACK:10000000 /machine:I386 /debug" - AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib newton.lib dMath_d.lib JointLibrary_d.lib OgreMain_d.lib $(NOINHERIT)" + AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib newton.lib dMath_d.lib dJointLibrary_d.lib OgreMain_d.lib $(NOINHERIT)" OutputFile="./lib/OgreNewt_d.dll" Version="2.0" LinkIncremental="1" @@ -112,7 +112,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="copy $(OutDir)\OgreNewt_d.dll demos\bin\Debug\OgreNewt_d.dll


if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" "demos\bin\Debug\OgreMain_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" "demos\bin\Debug\OIS_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" "demos\bin\Debug\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" "demos\bin\Debug\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" "demos\bin\Debug\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreGUIRenderer_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreGUIRenderer_d.dll" "demos\bin\Debug\OgreGUIRenderer_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIBase_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIBase_d.dll" "demos\bin\Debug\CEGUIBase_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIExpatParser_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIExpatParser_d.dll" "demos\bin\Debug\CEGUIExpatParser_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" "demos\bin\Debug\cg.dll"

if exist "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" copy "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" "demos\bin\Debug\OgreMain_d.dll"
if exist "$(OGRE_HOME)\bin\debug\OIS_d.dll" copy "$(OGRE_HOME)\bin\debug\OIS_d.dll" demos\bin\Debug\OIS_d.dll"
if exist "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" demos\bin\Debug\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" demos\bin\Debug\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" demos\bin\Debug\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\bin\debug\OgreGUIRenderer_d.dll" copy "$(OGRE_HOME)\bin\debug\OgreGUIRenderer_d.dll" demos\bin\Debug\OgreGUIRenderer_d.dll"
if exist "$(OGRE_HOME)\bin\debug\CEGUIBase_d.dll" copy "$(OGRE_HOME)\bin\debug\CEGUIBase_d.dll" demos\bin\Debug\CEGUIBase_d.dll"
if exist "$(OGRE_HOME)\bin\debug\CEGUIExpatParser_d.dll" copy "$(OGRE_HOME)\bin\debug\CEGUIExpatParser_d.dll" demos\bin\Debug\CEGUIExpatParser_d.dll"
if exist "$(OGRE_HOME)\bin\debug\cg.dll" copy "$(OGRE_HOME)\bin\debug\cg.dll" demos\bin\Debug\cg.dll"

copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll demos\bin\Debug\newton.dll
copy $(NEWTON_HOME)\sdk\x32\JointLibrary_d.dll demos\bin\Debug\JointLibrary_d.dll

" + CommandLine="copy $(OutDir)\OgreNewt_d.dll demos\bin\Debug\OgreNewt_d.dll


if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" "demos\bin\Debug\OgreMain_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" "demos\bin\Debug\OIS_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" "demos\bin\Debug\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" "demos\bin\Debug\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" "demos\bin\Debug\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreGUIRenderer_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreGUIRenderer_d.dll" "demos\bin\Debug\OgreGUIRenderer_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIBase_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIBase_d.dll" "demos\bin\Debug\CEGUIBase_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIExpatParser_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\CEGUIExpatParser_d.dll" "demos\bin\Debug\CEGUIExpatParser_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" "demos\bin\Debug\cg.dll"

if exist "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" copy "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" "demos\bin\Debug\OgreMain_d.dll"
if exist "$(OGRE_HOME)\bin\debug\OIS_d.dll" copy "$(OGRE_HOME)\bin\debug\OIS_d.dll" demos\bin\Debug\OIS_d.dll"
if exist "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" demos\bin\Debug\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" demos\bin\Debug\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" demos\bin\Debug\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\bin\debug\OgreGUIRenderer_d.dll" copy "$(OGRE_HOME)\bin\debug\OgreGUIRenderer_d.dll" demos\bin\Debug\OgreGUIRenderer_d.dll"
if exist "$(OGRE_HOME)\bin\debug\CEGUIBase_d.dll" copy "$(OGRE_HOME)\bin\debug\CEGUIBase_d.dll" demos\bin\Debug\CEGUIBase_d.dll"
if exist "$(OGRE_HOME)\bin\debug\CEGUIExpatParser_d.dll" copy "$(OGRE_HOME)\bin\debug\CEGUIExpatParser_d.dll" demos\bin\Debug\CEGUIExpatParser_d.dll"
if exist "$(OGRE_HOME)\bin\debug\cg.dll" copy "$(OGRE_HOME)\bin\debug\cg.dll" demos\bin\Debug\cg.dll"

if exist "$(OGRE_BUILD_HOME)\bin\release\OgreMain_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OgreMain_d.dll" "demos\bin\Release\OgreMain_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\OIS.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\Plugin_CgProgramManager_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\Plugin_CgProgramManager_d.dll" "demos\bin\Release\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_Direct3D9_d.dll" "demos\bin\Release\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_GL_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_GL_d.dll" "demos\bin\Release\RenderSystem_GL_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\OgreGUIRenderer_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OgreGUIRenderer_d.dll" "demos\bin\Release\OgreGUIRenderer_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\CEGUIBase_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\CEGUIBase_d.dll" "demos\bin\Release\CEGUIBase_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\CEGUIExpatParser_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\CEGUIExpatParser_d.dll" "demos\bin\Release\CEGUIExpatParser_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\cg.dll" copy "$(OGRE_BUILD_HOME)\bin\release\cg.dll" "demos\bin\Release\cg.dll"

copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll demos\bin\Debug\newton.dll
copy $(NEWTON_HOME)\sdk\x32\dJointLibrary_d.dll demos\bin\Debug\dJointLibrary_d.dll

" /> </Configuration> <Configuration @@ -182,7 +182,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions=" /STACK:10000000 /machine:I386" - AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib newton.lib dMath.lib JointLibrary.lib OgreMain.lib $(NOINHERIT)" + AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib newton.lib dMath.lib dJointLibrary.lib OgreMain.lib $(NOINHERIT)" OutputFile="./lib/OgreNewt.dll" Version="2.0" LinkIncremental="1" @@ -215,7 +215,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="copy $(OutDir)\OgreNewt.dll demos\bin\Release\OgreNewt.dll

if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OgreMain.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OgreMain.dll" "demos\bin\Release\OgreMain.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OIS.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\Plugin_CgProgramManager.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\Plugin_CgProgramManager.dll" "demos\bin\Release\Plugin_CgProgramManager.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_Direct3D9.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_Direct3D9.dll" "demos\bin\Release\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_GL.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_GL.dll" "demos\bin\Release\RenderSystem_GL.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OgreGUIRenderer.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OgreGUIRenderer.dll" "demos\bin\Release\OgreGUIRenderer.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIBase.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIBase.dll" "demos\bin\Release\CEGUIBase.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIExpatParser.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIExpatParser.dll" "demos\bin\Release\CEGUIExpatParser.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\cg.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\cg.dll" "demos\bin\Release\cg.dll"

if exist "$(OGRE_HOME)\bin\release\OgreMain.dll" copy "$(OGRE_HOME)\bin\release\OgreMain.dll" "demos\bin\Release\OgreMain.dll"
if exist "$(OGRE_HOME)\bin\release\OIS.dll" copy "$(OGRE_HOME)\bin\release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_HOME)\bin\release\Plugin_CgProgramManager.dll" copy "$(OGRE_HOME)\bin\release\Plugin_CgProgramManager.dll" "demos\bin\Release\Plugin_CgProgramManager.dll"
if exist "$(OGRE_HOME)\bin\release\RenderSystem_Direct3D9.dll" copy "$(OGRE_HOME)\bin\release\RenderSystem_Direct3D9.dll" "demos\bin\Release\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_HOME)\bin\release\RenderSystem_GL.dll" copy "$(OGRE_HOME)\bin\release\RenderSystem_GL.dll" "demos\bin\Release\RenderSystem_GL.dll"
if exist "$(OGRE_HOME)\bin\release\OgreGUIRenderer.dll" copy "$(OGRE_HOME)\bin\release\OgreGUIRenderer.dll" "demos\bin\Release\OgreGUIRenderer.dll"
if exist "$(OGRE_HOME)\bin\release\CEGUIBase.dll" copy "$(OGRE_HOME)\bin\release\CEGUIBase.dll" "demos\bin\Release\CEGUIBase.dll"
if exist "$(OGRE_HOME)\bin\release\CEGUIExpatParser.dll" copy "$(OGRE_HOME)\bin\release\CEGUIExpatParser.dll" "demos\bin\Release\CEGUIExpatParser.dll"
if exist "$(OGRE_HOME)\bin\release\cg.dll" copy "$(OGRE_HOME)\bin\release\cg.dll" "demos\bin\Release\cg.dll"

if exist "$(OGRE_BUILD_HOME)\bin\release\OgreMain.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OgreMain.dll" "demos\bin\Release\OgreMain.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\OIS.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\Plugin_CgProgramManager.dll" copy "$(OGRE_BUILD_HOME)\bin\release\Plugin_CgProgramManager.dll" "demos\bin\Release\Plugin_CgProgramManager.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_Direct3D9.dll" copy "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_Direct3D9.dll" "demos\bin\Release\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_GL.dll" copy "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_GL.dll" "demos\bin\Release\RenderSystem_GL.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\OgreGUIRenderer.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OgreGUIRenderer.dll" "demos\bin\Release\OgreGUIRenderer.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\CEGUIBase.dll" copy "$(OGRE_BUILD_HOME)\bin\release\CEGUIBase.dll" "demos\bin\Release\CEGUIBase.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\CEGUIExpatParser.dll" copy "$(OGRE_BUILD_HOME)\bin\release\CEGUIExpatParser.dll" "demos\bin\Release\CEGUIExpatParser.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\cg.dll" copy "$(OGRE_BUILD_HOME)\bin\release\cg.dll" "demos\bin\Release\cg.dll"

copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll demos\bin\Release\newton.dll
copy $(NEWTON_HOME)\sdk\x32\JointLibrary.dll demos\bin\Release\JointLibrary.dll" + CommandLine="copy $(OutDir)\OgreNewt.dll demos\bin\Release\OgreNewt.dll

if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OgreMain.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OgreMain.dll" "demos\bin\Release\OgreMain.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OIS.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\Plugin_CgProgramManager.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\Plugin_CgProgramManager.dll" "demos\bin\Release\Plugin_CgProgramManager.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_Direct3D9.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_Direct3D9.dll" "demos\bin\Release\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_GL.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_GL.dll" "demos\bin\Release\RenderSystem_GL.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OgreGUIRenderer.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OgreGUIRenderer.dll" "demos\bin\Release\OgreGUIRenderer.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIBase.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIBase.dll" "demos\bin\Release\CEGUIBase.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIExpatParser.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\CEGUIExpatParser.dll" "demos\bin\Release\CEGUIExpatParser.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\cg.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\cg.dll" "demos\bin\Release\cg.dll"

if exist "$(OGRE_HOME)\bin\release\OgreMain.dll" copy "$(OGRE_HOME)\bin\release\OgreMain.dll" "demos\bin\Release\OgreMain.dll"
if exist "$(OGRE_HOME)\bin\release\OIS.dll" copy "$(OGRE_HOME)\bin\release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_HOME)\bin\release\Plugin_CgProgramManager.dll" copy "$(OGRE_HOME)\bin\release\Plugin_CgProgramManager.dll" "demos\bin\Release\Plugin_CgProgramManager.dll"
if exist "$(OGRE_HOME)\bin\release\RenderSystem_Direct3D9.dll" copy "$(OGRE_HOME)\bin\release\RenderSystem_Direct3D9.dll" "demos\bin\Release\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_HOME)\bin\release\RenderSystem_GL.dll" copy "$(OGRE_HOME)\bin\release\RenderSystem_GL.dll" "demos\bin\Release\RenderSystem_GL.dll"
if exist "$(OGRE_HOME)\bin\release\OgreGUIRenderer.dll" copy "$(OGRE_HOME)\bin\release\OgreGUIRenderer.dll" "demos\bin\Release\OgreGUIRenderer.dll"
if exist "$(OGRE_HOME)\bin\release\CEGUIBase.dll" copy "$(OGRE_HOME)\bin\release\CEGUIBase.dll" "demos\bin\Release\CEGUIBase.dll"
if exist "$(OGRE_HOME)\bin\release\CEGUIExpatParser.dll" copy "$(OGRE_HOME)\bin\release\CEGUIExpatParser.dll" "demos\bin\Release\CEGUIExpatParser.dll"
if exist "$(OGRE_HOME)\bin\release\cg.dll" copy "$(OGRE_HOME)\bin\release\cg.dll" "demos\bin\Release\cg.dll"

if exist "$(OGRE_BUILD_HOME)\bin\release\OgreMain.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OgreMain.dll" "demos\bin\Release\OgreMain.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\OIS.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\Plugin_CgProgramManager.dll" copy "$(OGRE_BUILD_HOME)\bin\release\Plugin_CgProgramManager.dll" "demos\bin\Release\Plugin_CgProgramManager.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_Direct3D9.dll" copy "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_Direct3D9.dll" "demos\bin\Release\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_GL.dll" copy "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_GL.dll" "demos\bin\Release\RenderSystem_GL.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\OgreGUIRenderer.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OgreGUIRenderer.dll" "demos\bin\Release\OgreGUIRenderer.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\CEGUIBase.dll" copy "$(OGRE_BUILD_HOME)\bin\release\CEGUIBase.dll" "demos\bin\Release\CEGUIBase.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\CEGUIExpatParser.dll" copy "$(OGRE_BUILD_HOME)\bin\release\CEGUIExpatParser.dll" "demos\bin\Release\CEGUIExpatParser.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\cg.dll" copy "$(OGRE_BUILD_HOME)\bin\release\cg.dll" "demos\bin\Release\cg.dll"

copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll demos\bin\Release\newton.dll
copy $(NEWTON_HOME)\sdk\x32\dJointLibrary.dll demos\bin\Release\dJointLibrary.dll
" /> </Configuration> </Configurations> Modified: branches/ogrenewt/newton20/OgreNewt.vcxproj =================================================================== --- branches/ogrenewt/newton20/OgreNewt.vcxproj 2010-08-25 09:40:46 UTC (rev 2963) +++ branches/ogrenewt/newton20/OgreNewt.vcxproj 2010-08-26 13:23:29 UTC (rev 2964) @@ -89,7 +89,7 @@ </ResourceCompile> <Link> <AdditionalOptions> /STACK:10000000 /machine:I386 /debug %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;newton.lib;dMath_d.lib;JointLibrary_d.lib;OgreMain_d.lib</AdditionalDependencies> + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;newton.lib;dMath_d.lib;dJointLibrary_d.lib;OgreMain_d.lib</AdditionalDependencies> <OutputFile>./lib/OgreNewt_d.dll</OutputFile> <Version>2.0</Version> <AdditionalLibraryDirectories>$(OGRE_HOME)/lib;$(OGRE_BUILD_HOME)/lib/Debug;$(BOOST_HOME)/libs;$(NEWTON_HOME)/sdk/x32;$(NEWTON_HOME)/sdk/x32/dll_vs9;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -135,7 +135,7 @@ if exist "$(OGRE_BUILD_HOME)\bin\debug\cg.dll" copy "$(OGRE_BUILD_HOME)\bin\debug\cg.dll" demos\bin\Debug\cg.dll" copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll demos\bin\Debug\newton.dll -copy $(NEWTON_HOME)\sdk\x32\JointLibrary_d.dll demos\bin\Debug\JointLibrary_d.dll +copy $(NEWTON_HOME)\sdk\x32\dJointLibrary_d.dll demos\bin\Debug\dJointLibrary_d.dll </Command> </PostBuildEvent> @@ -178,7 +178,7 @@ </ResourceCompile> <Link> <AdditionalOptions> /STACK:10000000 /machine:I386 %(AdditionalOptions)</AdditionalOptions> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;newton.lib;dMath.lib;JointLibrary.lib;OgreMain.lib</AdditionalDependencies> + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;newton.lib;dMath.lib;dJointLibrary.lib;OgreMain.lib</AdditionalDependencies> <OutputFile>./lib/OgreNewt.dll</OutputFile> <Version>2.0</Version> <AdditionalLibraryDirectories>$(OGRE_HOME)/lib;$(OGRE_BUILD_HOME)/lib/Release;$(BOOST_HOME)/libs;$(NEWTON_HOME)/sdk/x32;$(NEWTON_HOME)/sdk/x32/dll_vs9;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -224,7 +224,7 @@ if exist "$(OGRE_BUILD_HOME)\bin\release\cg.dll" copy "$(OGRE_BUILD_HOME)\bin\release\cg.dll" "demos\bin\Release\cg.dll" copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll demos\bin\Release\newton.dll -copy $(NEWTON_HOME)\sdk\x32\JointLibrary.dll demos\bin\Release\JointLibrary.dll +copy $(NEWTON_HOME)\sdk\x32\dJointLibrary.dll demos\bin\Release\dJointLibrary.dll </Command> </PostBuildEvent> </ItemDefinitionGroup> Modified: branches/ogrenewt/newton20/OgreNewt_VS9.suo =================================================================== (Binary files differ) Modified: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcproj =================================================================== --- branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcproj 2010-08-25 09:40:46 UTC (rev 2963) +++ branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcproj 2010-08-26 13:23:29 UTC (rev 2964) @@ -25,7 +25,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="copy ..\..\lib\OgreNewt_d.dll $(OutDir)\OgreNewt_d.dll

if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" "$(OutDir)\OgreMain_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" "$(OutDir)\OIS_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" "$(OutDir)\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" "$(OutDir)\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" "$(OutDir)\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" "$(OutDir)\cg.dll"

if exist "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" copy "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" "$(OutDir)\OgreMain_d.dll"
if exist "$(OGRE_HOME)\bin\debug\OIS_d.dll" copy "$(OGRE_HOME)\bin\debug\OIS_d.dll" demos\bin\Debug\OIS_d.dll"
if exist "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" demos\bin\Debug\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" demos\bin\Debug\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" demos\bin\Debug\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\bin\debug\cg.dll" copy "$(OGRE_HOME)\bin\debug\cg.dll" demos\bin\Debug\cg.dll"

copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll $(OutDir)\newton.dll
copy $(NEWTON_HOME)\sdk\x32\JointLibrary_d.dll $(OutDir)\JointLibrary_d.dll
" + CommandLine="copy ..\..\lib\OgreNewt_d.dll $(OutDir)\OgreNewt_d.dll

if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OgreMain_d.dll" "$(OutDir)\OgreMain_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\OIS_d.dll" "$(OutDir)\OIS_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\Plugin_CgProgramManager_d.dll" "$(OutDir)\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_Direct3D9_d.dll" "$(OutDir)\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\RenderSystem_GL_d.dll" "$(OutDir)\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Debug\cg.dll" "$(OutDir)\cg.dll"

if exist "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" copy "$(OGRE_HOME)\bin\debug\OgreMain_d.dll" "$(OutDir)\OgreMain_d.dll"
if exist "$(OGRE_HOME)\bin\debug\OIS_d.dll" copy "$(OGRE_HOME)\bin\debug\OIS_d.dll" demos\bin\Debug\OIS_d.dll"
if exist "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" copy "$(OGRE_HOME)\bin\debug\Plugin_CgProgramManager_d.dll" demos\bin\Debug\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_Direct3D9_d.dll" demos\bin\Debug\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" copy "$(OGRE_HOME)\bin\debug\RenderSystem_GL_d.dll" demos\bin\Debug\RenderSystem_GL_d.dll"
if exist "$(OGRE_HOME)\bin\debug\cg.dll" copy "$(OGRE_HOME)\bin\debug\cg.dll" demos\bin\Debug\cg.dll"

if exist "$(OGRE_BUILD_HOME)\bin\release\OgreMain_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OgreMain_d.dll" "demos\bin\Release\OgreMain_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\OIS.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OIS.dll" "demos\bin\Release\OIS.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\Plugin_CgProgramManager_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\Plugin_CgProgramManager_d.dll" "demos\bin\Release\Plugin_CgProgramManager_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_Direct3D9_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_Direct3D9_d.dll" "demos\bin\Release\RenderSystem_Direct3D9_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_GL_d.dll" copy "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_GL_d.dll" "demos\bin\Release\RenderSystem_GL_d.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\cg.dll" copy "$(OGRE_BUILD_HOME)\bin\release\cg.dll" "demos\bin\Release\cg.dll"

copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll $(OutDir)\newton.dll
copy $(NEWTON_HOME)\sdk\x32\dJointLibrary_d.dll $(OutDir)\dJointLibrary_d.dll
" /> <Tool Name="VCCustomBuildTool" @@ -102,7 +102,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="copy ..\..\lib\OgreNewt.dll $(OutDir)\OgreNewt.dll

if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OgreMain.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OgreMain.dll" "$(OutDir)\OgreMain.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OIS.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OIS.dll" "$(OutDir)\OIS.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\Plugin_CgProgramManager.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\Plugin_CgProgramManager.dll" "$(OutDir)\Plugin_CgProgramManager.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_Direct3D9.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_Direct3D9.dll" "$(OutDir)\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_GL.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_GL.dll" "$(OutDir)\RenderSystem_GL.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\cg.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\cg.dll" "$(OutDir)\cg.dll"

if exist "$(OGRE_HOME)\bin\release\OgreMain.dll" copy "$(OGRE_HOME)\bin\release\OgreMain.dll" "$(OutDir)\OgreMain.dll"
if exist "$(OGRE_HOME)\bin\release\OIS.dll" copy "$(OGRE_HOME)\bin\release\OIS.dll" "$(OutDir)\OIS.dll"
if exist "$(OGRE_HOME)\bin\release\Plugin_CgProgramManager.dll" copy "$(OGRE_HOME)\bin\release\Plugin_CgProgramManager.dll" "$(OutDir)\Plugin_CgProgramManager.dll"
if exist "$(OGRE_HOME)\bin\release\RenderSystem_Direct3D9.dll" copy "$(OGRE_HOME)\bin\release\RenderSystem_Direct3D9.dll" "$(OutDir)\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_HOME)\bin\release\RenderSystem_GL.dll" copy "$(OGRE_HOME)\bin\release\RenderSystem_GL.dll" "$(OutDir)\RenderSystem_GL.dll"
if exist "$(OGRE_HOME)\bin\release\cg.dll" copy "$(OGRE_HOME)\bin\release\cg.dll" "$(OutDir)\cg.dll"

copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll $(OutDir)\newton.dll
copy $(NEWTON_HOME)\sdk\x32\JointLibrary.dll $(OutDir)\JointLibrary.dll
" + CommandLine="copy ..\..\lib\OgreNewt.dll $(OutDir)\OgreNewt.dll

if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OgreMain.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OgreMain.dll" "$(OutDir)\OgreMain.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\OIS.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\OIS.dll" "$(OutDir)\OIS.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\Plugin_CgProgramManager.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\Plugin_CgProgramManager.dll" "$(OutDir)\Plugin_CgProgramManager.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_Direct3D9.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_Direct3D9.dll" "$(OutDir)\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_GL.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\RenderSystem_GL.dll" "$(OutDir)\RenderSystem_GL.dll"
if exist "$(OGRE_HOME)\Samples\Common\bin\Release\cg.dll" copy "$(OGRE_HOME)\Samples\Common\bin\Release\cg.dll" "$(OutDir)\cg.dll"

if exist "$(OGRE_HOME)\bin\release\OgreMain.dll" copy "$(OGRE_HOME)\bin\release\OgreMain.dll" "$(OutDir)\OgreMain.dll"
if exist "$(OGRE_HOME)\bin\release\OIS.dll" copy "$(OGRE_HOME)\bin\release\OIS.dll" "$(OutDir)\OIS.dll"
if exist "$(OGRE_HOME)\bin\release\Plugin_CgProgramManager.dll" copy "$(OGRE_HOME)\bin\release\Plugin_CgProgramManager.dll" "$(OutDir)\Plugin_CgProgramManager.dll"
if exist "$(OGRE_HOME)\bin\release\RenderSystem_Direct3D9.dll" copy "$(OGRE_HOME)\bin\release\RenderSystem_Direct3D9.dll" "$(OutDir)\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_HOME)\bin\release\RenderSystem_GL.dll" copy "$(OGRE_HOME)\bin\release\RenderSystem_GL.dll" "$(OutDir)\RenderSystem_GL.dll"
if exist "$(OGRE_HOME)\bin\release\cg.dll" copy "$(OGRE_HOME)\bin\release\cg.dll" "$(OutDir)\cg.dll"

if exist "$(OGRE_BUILD_HOME)\bin\release\OgreMain.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OgreMain.dll" "$(OutDir)\OgreMain.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\OIS.dll" copy "$(OGRE_BUILD_HOME)\bin\release\OIS.dll" "$(OutDir)\OIS.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\Plugin_CgProgramManager.dll" copy "$(OGRE_BUILD_HOME)\bin\release\Plugin_CgProgramManager.dll" "$(OutDir)\Plugin_CgProgramManager.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_Direct3D9.dll" copy "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_Direct3D9.dll" "$(OutDir)\RenderSystem_Direct3D9.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_GL.dll" copy "$(OGRE_BUILD_HOME)\bin\release\RenderSystem_GL.dll" "$(OutDir)\RenderSystem_GL.dll"
if exist "$(OGRE_BUILD_HOME)\bin\release\cg.dll" copy "$(OGRE_BUILD_HOME)\bin\release\cg.dll" "$(OutDir)\cg.dll"

copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll $(OutDir)\newton.dll
copy $(NEWTON_HOME)\sdk\x32\dJointLibrary.dll $(OutDir)\dJointLibrary.dll
" /> <Tool Name="VCCustomBuildTool" Modified: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcxproj =================================================================== --- branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcxproj 2010-08-25 09:40:46 UTC (rev 2963) +++ branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt.vcxproj 2010-08-26 13:23:29 UTC (rev 2964) @@ -79,7 +79,7 @@ if exist "$(OGRE_BUILD_HOME)\bin\debug\cg.dll" copy "$(OGRE_BUILD_HOME)\bin\debug\cg.dll" "$(OutDir)cg.dll" copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll $(OutDir)newton.dll -copy $(NEWTON_HOME)\sdk\x32\JointLibrary_d.dll $(OutDir)JointLibrary_d.dll +copy $(NEWTON_HOME)\sdk\x32\dJointLibrary_d.dll $(OutDir)dJointLibrary_d.dll </Command> </PreBuildEvent> <ClCompile> @@ -130,7 +130,7 @@ if exist "$(OGRE_BUILD_HOME)\bin\release\cg.dll" copy "$(OGRE_BUILD_HOME)\bin\release\cg.dll" "$(OutDir)cg.dll" copy $(NEWTON_HOME)\sdk\x32\dll_vs9\newton.dll $(OutDir)newton.dll -copy $(NEWTON_HOME)\sdk\x32\JointLibrary.dll $(OutDir)JointLibrary.dll +copy $(NEWTON_HOME)\sdk\x32\dJointLibrary.dll $(OutDir)dJointLibrary.dll </Command> </PreBuildEvent> <ClCompile> Modified: branches/ogrenewt/newton20/demos/MinimalOgreNewtApplication/MinimalOgreNewt_VS9.suo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |