explicitly remove textures during resetSimulation

move glViewport to Win32Window

examples/SharedMemory/PhysicsServerCommandProcessor.cpp

@@ -190,6 +190,7 @@ struct InternalBodyData
 	btAlignedObjectArray<std::string> m_rigidBodyJointNames;
 	btAlignedObjectArray<std::string> m_rigidBodyLinkNames;
 	
+	
 #ifdef B3_ENABLE_TINY_AUDIO
 	b3HashMap<btHashInt, SDFAudioSource> m_audioSources;
 #endif //B3_ENABLE_TINY_AUDIO
@@ -1525,6 +1526,7 @@ struct PhysicsServerCommandProcessorInternalData
 	btAlignedObjectArray<std::string*> m_strings;
 
 	btAlignedObjectArray<btCollisionShape*>	m_collisionShapes;
+	btAlignedObjectArray<int> m_allocatedTextures;
 	btHashMap<btHashPtr, UrdfCollision> m_bulletCollisionShape2UrdfCollision;
 	btAlignedObjectArray<btStridingMeshInterface*> m_meshInterfaces;
 
@@ -2431,6 +2433,16 @@ void PhysicsServerCommandProcessor::deleteDynamicsWorld()
 	{
 		delete m_data->m_meshInterfaces[j];
 	}
+
+	if (m_data->m_guiHelper)
+	{
+		for (int j = 0; j < m_data->m_allocatedTextures.size(); j++)
+		{
+			int texId = m_data->m_allocatedTextures[j];
+			m_data->m_guiHelper->removeTexture(texId);
+		}
+	}
+	m_data->m_allocatedTextures.clear();
 	m_data->m_meshInterfaces.clear();
 	m_data->m_collisionShapes.clear();
 	m_data->m_bulletCollisionShape2UrdfCollision.clear();
@@ -2667,6 +2679,15 @@ bool PhysicsServerCommandProcessor::processImportedObjects(const char* fileName,
 
     }
 
+	
+	for (int i = 0; i < u2b.getNumAllocatedTextures(); i++)
+	{
+		int texId = u2b.getAllocatedTexture(i);
+		m_data->m_allocatedTextures.push_back(texId);
+	}
+		
+
+
 	for (int i=0;i<u2b.getNumAllocatedMeshInterfaces();i++)
 	{
 		m_data->m_meshInterfaces.push_back(u2b.getAllocatedMeshInterface(i));

examples/SharedMemory/PhysicsServerExample.cpp

@@ -135,6 +135,7 @@ enum MultiThreadedGUIHelperCommunicationEnums
 	eGUIHelperChangeGraphicsInstanceTextureId,
 	eGUIHelperGetShapeIndexFromInstance,
 	eGUIHelperChangeTexture,
+	eGUIHelperRemoveTexture,
 };
 
 
@@ -859,6 +860,17 @@ public:
 		//m_childGuiHelper->createPhysicsDebugDrawer(rbWorld);
 	}
 
+	int m_removeTextureUid;
+
+	virtual void removeTexture(int textureUid)
+	{
+		m_removeTextureUid = textureUid;
+		m_cs->lock();
+		m_cs->setSharedParam(1, eGUIHelperRemoveTexture);
+
+		workerThreadWait();
+	}
+
 	virtual int	registerTexture(const unsigned char* texels, int width, int height)
 	{
 		m_texels = texels;
@@ -1878,6 +1890,13 @@ void	PhysicsServerExample::updateGraphics()
 		m_multiThreadedHelper->mainThreadRelease();
 		break;
 	}
+	case eGUIHelperRemoveTexture:
+	{
+		B3_PROFILE("eGUIHelperRemoveTexture");
+		m_multiThreadedHelper->m_childGuiHelper->removeTexture(m_multiThreadedHelper->m_removeTextureUid);
+		m_multiThreadedHelper->mainThreadRelease();
+		break;
+	}
 	case eGUIHelperRegisterGraphicsShape:
 	{
 		B3_PROFILE("eGUIHelperRegisterGraphicsShape");