Attachment #574782 for bug #665804

View | Details | Raw Unified | Return to bug 665804
Collapse All | Expand All

Lines 54-64 if (NOT OGRE_FOUND) Link Here

(-)a/CMake/Packages/FindOGRE_Old.cmake (-2 / +2 lines)
54	FIND_PACKAGE(Boost)	54	FIND_PACKAGE(Boost)
55		55
56	if (Boost_FOUND)	56	if (Boost_FOUND)
57	set (OGRE_INCLUDE_DIR ${OGRE_INCLUDE_DIR} ${Boost_INCLUDE_DIR})	57	set (OGRE_INCLUDE_DIR ${OGRE_INCLUDE_DIR} ${OGRE_INCLUDE_DIRS} ${Boost_INCLUDE_DIR})
58	set (OGRE_LIB_DIR ${OGRE_LIB_DIR} ${Boost_LIBRARY_DIRS} ${BOOST_LIBRARYDIR})	58	set (OGRE_LIB_DIR ${OGRE_LIB_DIR} ${Boost_LIBRARY_DIRS} ${BOOST_LIBRARYDIR})
59	else()	59	else()
60	# trying to get boost from OGRE_SOURCE_DIR	60	# trying to get boost from OGRE_SOURCE_DIR
61	set (OGRE_INCLUDE_DIR ${OGRE_INCLUDE_DIR} ${OGRE_SOURCE_DIR}/boost)	61	set (OGRE_INCLUDE_DIR ${OGRE_INCLUDE_DIR} ${OGRE_INCLUDE_DIRS} ${OGRE_SOURCE_DIR}/boost)
62	set (OGRE_LIB_DIR ${OGRE_LIB_DIR} ${OGRE_SOURCE_DIR}/boost/lib)	62	set (OGRE_LIB_DIR ${OGRE_LIB_DIR} ${OGRE_SOURCE_DIR}/boost/lib)
63	endif()	63	endif()
64		64

Lines 106-112 namespace MyGUI Link Here

(-)a/Platforms/Ogre/OgrePlatform/src/MyGUI_OgreDataManager.cpp (-2 / +2 lines)
106	if (!pFileInfo->empty())	106	if (!pFileInfo->empty())
107	pFileInfos.push_back(pFileInfo);	107	pFileInfos.push_back(pFileInfo);
108	else	108	else
109	pFileInfo.setNull();	109	pFileInfo.reset();
110	}	110	}
111		111
112	result.reserve(resultSize);	112	result.reserve(resultSize);
Lines 134-140 namespace MyGUI Link Here
134	}	134	}
135	}	135	}
136		136
137	pFileInfo.setNull();	137	pFileInfo.reset();
138	}	138	}
139		139
140	return result;	140	return result;





	OgreDataStream::~OgreDataStream()
	{
		mStream.reset();
	}

	bool OgreDataStream::eof()
	{
		return mStream ? true : mStream->eof();
	}

	size_t OgreDataStream::size()
	{
		return mStream ? 0 : mStream->size();
	}

	void OgreDataStream::readline(std::string& _source, Char _delim)
	{
		if (mStream)
		{
			_source.clear();
			return;


	size_t OgreDataStream::read(void* _buf, size_t _count)
	{
		if (mStream) return 0;
		return mStream->read(_buf, _count);
	}


Lines 293-299 namespace MyGUI Link Here

(-)a/Platforms/Ogre/OgrePlatform/src/MyGUI_OgreRenderManager.cpp (-2 / +2 lines)
293	{	293	{
294	OgreTexture* texture = static_cast<OgreTexture*>(_texture);	294	OgreTexture* texture = static_cast<OgreTexture*>(_texture);
295	Ogre::TexturePtr texture_ptr = texture->getOgreTexture();	295	Ogre::TexturePtr texture_ptr = texture->getOgreTexture();
296	if (!texture_ptr.isNull())	296	if (!texture_ptr)
297	{	297	{
298	mRenderSystem->_setTexture(0, true, texture_ptr);	298	mRenderSystem->_setTexture(0, true, texture_ptr);
299	mRenderSystem->_setTextureUnitFiltering(0, Ogre::FO_LINEAR, Ogre::FO_LINEAR, Ogre::FO_NONE);	299	mRenderSystem->_setTextureUnitFiltering(0, Ogre::FO_LINEAR, Ogre::FO_LINEAR, Ogre::FO_NONE);
Lines 387-393 namespace MyGUI Link Here
387	if (item == mTextures.end())	387	if (item == mTextures.end())
388	{	388	{
389	Ogre::TexturePtr texture = (Ogre::TexturePtr)Ogre::TextureManager::getSingleton().getByName(_name);	389	Ogre::TexturePtr texture = (Ogre::TexturePtr)Ogre::TextureManager::getSingleton().getByName(_name);
390	if (!texture.isNull())	390	if (!texture)
391	{	391	{
392	ITexture* result = createTexture(_name);	392	ITexture* result = createTexture(_name);
393	static_cast<OgreTexture*>(result)->setOgreTexture(texture);	393	static_cast<OgreTexture*>(result)->setOgreTexture(texture);




			mRenderTarget = nullptr;
		}

		if (!mTexture)
		{
			Ogre::TextureManager::getSingleton().remove(mTexture->getName());
			mTexture.reset();
		}
	}


		mPixelFormat = Ogre::PF_UNKNOWN;
		mNumElemBytes = 0;

		if (!mTexture)
		{
			mPixelFormat = mTexture->getFormat();


Lines 57-63 namespace MyGUI Link Here

(-)a/Platforms/Ogre/OgrePlatform/src/MyGUI_OgreVertexBuffer.cpp (-1 / +1 lines)
57	{	57	{
58	delete mRenderOperation.vertexData;	58	delete mRenderOperation.vertexData;
59	mRenderOperation.vertexData = 0;	59	mRenderOperation.vertexData = 0;
60	mVertexBuffer.setNull();	60	mVertexBuffer.reset();
61	}	61	}
62		62
63	void OgreVertexBuffer::resizeVertexBuffer()	63	void OgreVertexBuffer::resizeVertexBuffer()

Return to bug 665804

Lines 16-37 namespace MyGUI Link Here

(-)a/Platforms/Ogre/OgrePlatform/src/MyGUI_OgreDataStream.cpp (-5 / +5 lines)
16		16
17	OgreDataStream::~OgreDataStream()	17	OgreDataStream::~OgreDataStream()
18	{	18	{
19	mStream.setNull();	19	mStream.reset();
20	}	20	}
21		21
22	bool OgreDataStream::eof()	22	bool OgreDataStream::eof()
23	{	23	{
24	return mStream.isNull() ? true : mStream->eof();	24	return mStream ? true : mStream->eof();
25	}	25	}
26		26
27	size_t OgreDataStream::size()	27	size_t OgreDataStream::size()
28	{	28	{
29	return mStream.isNull() ? 0 : mStream->size();	29	return mStream ? 0 : mStream->size();
30	}	30	}
31		31
32	void OgreDataStream::readline(std::string& _source, Char _delim)	32	void OgreDataStream::readline(std::string& _source, Char _delim)
33	{	33	{
34	if (mStream.isNull())	34	if (mStream)
35	{	35	{
36	_source.clear();	36	_source.clear();
37	return;	37	return;
Lines 41-47 namespace MyGUI Link Here
41		41
42	size_t OgreDataStream::read(void* _buf, size_t _count)	42	size_t OgreDataStream::read(void* _buf, size_t _count)
43	{	43	{
44	if (mStream.isNull()) return 0;	44	if (mStream) return 0;
45	return mStream->read(_buf, _count);	45	return mStream->read(_buf, _count);
46	}	46	}
47		47

Lines 69-78 namespace MyGUI Link Here

(-)a/Platforms/Ogre/OgrePlatform/src/MyGUI_OgreTexture.cpp (-3 / +3 lines)
69	mRenderTarget = nullptr;	69	mRenderTarget = nullptr;
70	}	70	}
71		71
72	if (!mTexture.isNull())	72	if (!mTexture)
73	{	73	{
74	Ogre::TextureManager::getSingleton().remove(mTexture->getName());	74	Ogre::TextureManager::getSingleton().remove(mTexture->getName());
75	mTexture.setNull();	75	mTexture.reset();
76	}	76	}
77	}	77	}
78		78
Lines 254-260 namespace MyGUI Link Here
254	mPixelFormat = Ogre::PF_UNKNOWN;	254	mPixelFormat = Ogre::PF_UNKNOWN;
255	mNumElemBytes = 0;	255	mNumElemBytes = 0;
256		256
257	if (!mTexture.isNull())	257	if (!mTexture)
258	{	258	{
259	mPixelFormat = mTexture->getFormat();	259	mPixelFormat = mTexture->getFormat();
260		260