Ivan Safrin 11 лет назад
Родитель
Сommit
c498f5169e

+ 1 - 1
Core/Contents/Source/PolySceneSprite.cpp

@@ -463,7 +463,7 @@ void Sprite::removeSpriteState(SpriteState *state) {
     for(int i=0; i < states.size(); i++) {
         if(states[i] == state) {
             states.erase(states.begin() + i);
-            dispatchEvent(new Event(), Event::CHANGE_EVENT);            
+            dispatchEvent(new Event(), Event::CHANGE_EVENT);
             return;
         }
     }

+ 2 - 1
IDE/Contents/Source/PolycodeIDEApp.cpp

@@ -48,6 +48,7 @@ PolycodeIDEApp::PolycodeIDEApp(PolycodeView *view) : EventDispatcher() {
     
 	CoreServices::getInstance()->getResourceManager()->getGlobalPool()->reloadResourcesOnModify = true;
 	
+    CoreServices::getInstance()->getMaterialManager()->mipmapsDefault = true;    
     
 	runNextFrame = false;
 	
@@ -1271,7 +1272,7 @@ void PolycodeIDEApp::applyFinalConfig() {
 	}
 	
 	if(!setResFromConfig) {
-		core->setVideoMode(1100, 700, false, true, 0, 0);	
+		core->setVideoMode(1100, 700, false, true, 0, 0);
 		frame->Resize(1100, 700);			
 	}
 

+ 2 - 2
IDE/Contents/Source/PolycodeProps.cpp

@@ -3733,9 +3733,9 @@ void LayerSheet::handleEvent(Event *event) {
     PropSheet::handleEvent(event);
 }
 
-LinkedMaterialsSheet::LinkedMaterialsSheet() : PropSheet("LINKED MATERIALS", "linked_materials") {
+LinkedMaterialsSheet::LinkedMaterialsSheet() : PropSheet("LINKED RESOURCE POOLS", "linked_materials") {
     
-    addMaterialProp = new ButtonProp("Link materials file");
+    addMaterialProp = new ButtonProp("Link resource pool");
     addProp(addMaterialProp);
     addMaterialProp->getButton()->addEventListener(this, UIEvent::CLICK_EVENT);
     

+ 14 - 4
IDE/Contents/Source/PolycodeSpriteEditor.cpp

@@ -137,7 +137,7 @@ Vector2 TransformGrips::getAnchorPoint() {
 }
 
 TransformGrips::~TransformGrips() {
-    
+    Services()->getCore()->getInput()->removeAllHandlersForListener(this);
 }
 
 void TransformGrips::setGripRectangle(Polycode::Rectangle rectangle, Vector2 offset) {
@@ -644,7 +644,7 @@ void SpriteSheetEditor::clearSelected() {
 }
 
 SpriteSheetEditor::~SpriteSheetEditor() {
-    
+    Services()->getCore()->getInput()->removeAllHandlersForListener(this);
 }
 
 std::vector<unsigned int> SpriteSheetEditor::getSelectedFrameIDs() {
@@ -841,7 +841,8 @@ void SpriteBrowser::refreshSprites() {
 }
 
 SpriteBrowser::~SpriteBrowser() {
-    
+	globalFrame->textInputPopup->removeAllHandlersForListener(this);
+	globalFrame->yesNoPopup->removeAllHandlersForListener(this);
 }
 
 void SpriteBrowser::Resize(Number width, Number height) {
@@ -1569,7 +1570,7 @@ void SpriteStateEditBar::deleteSelectedFrames() {
 }
 
 SpriteStateEditBar::~SpriteStateEditBar() {
-    
+    Services()->getCore()->getInput()->removeAllHandlersForListener(this);
 }
 
 SpriteStateBrowser::SpriteStateBrowser() : UIElement() {
@@ -1753,6 +1754,8 @@ void SpriteStateEditor::refreshStates() {
 }
 
 SpriteStateEditor::~SpriteStateEditor() {
+	globalFrame->textInputPopup->removeAllHandlersForListener(this);
+	globalFrame->yesNoPopup->removeAllHandlersForListener(this);
     
 }
 
@@ -1918,6 +1921,13 @@ void PolycodeSpriteEditor::handleEvent(Event *event) {
 
 PolycodeSpriteEditor::~PolycodeSpriteEditor() {
     CoreServices::getInstance()->getResourceManager()->unsubscibeFromResourcePool(sprite);
+    delete mainSizer;
+    delete topSizer;
+    delete bottomSizer;
+    delete spriteSheetEditor;
+    delete spriteBrowser;
+    delete stateEditor;
+    delete spritePreview;
 }
 
 bool PolycodeSpriteEditor::openFile(OSFileEntry filePath) {