瀏覽代碼

Events no longer have eventType set to 'Event' by default, speed fixes, memory leak fixes

Ivan Safrin 13 年之前
父節點
當前提交
d070e47295

+ 1 - 0
Core/Contents/Include/PolySocket.h

@@ -30,6 +30,7 @@ THE SOFTWARE.
 #define MAX_PACKET_SIZE 1400
 #define MAX_PACKET_SIZE 1400
 
 
 // if set to 1, will create a thread for each network socket
 // if set to 1, will create a thread for each network socket
+// DO NOT USE FOR PRODUCTION
 #define USE_THREADED_SOCKETS 0
 #define USE_THREADED_SOCKETS 0
 
 
 // Socket poll interval time in msecs
 // Socket poll interval time in msecs

+ 1 - 3
Core/Contents/Source/PolyEvent.cpp

@@ -25,12 +25,10 @@
 namespace Polycode {
 namespace Polycode {
 	
 	
 	Event::Event() {
 	Event::Event() {
-			eventType = "Event";
 			deleteOnDispatch = true;
 			deleteOnDispatch = true;
 	}
 	}
 	
 	
-	Event::Event(int eventCode) {
-		eventType = "Event";		
+	Event::Event(int eventCode) {	
 		setEventCode(eventCode);
 		setEventCode(eventCode);
 	}
 	}
 	
 	

+ 1 - 4
Core/Contents/Source/PolyTimer.cpp

@@ -83,10 +83,7 @@ void Timer::Update(unsigned int ticks) {
 	
 	
 	this->ticks = ticks;
 	this->ticks = ticks;
 	elapsed = ticks-last;
 	elapsed = ticks-last;
-	
-//	if(elapsed > 10000)
-//		elapsed = 10000;
-	
+		
 	if(paused)
 	if(paused)
 		return;
 		return;
 
 

+ 1 - 1
IDE/Contents/Source/PolycodeConsole.cpp

@@ -193,7 +193,7 @@ void PolycodeConsole::setDebugger(PolycodeRemoteDebugger *debugger) {
 
 
 void PolycodeConsole::handleEvent(Event *event) {
 void PolycodeConsole::handleEvent(Event *event) {
 	if(event->getDispatcher() == consoleTextInput) {
 	if(event->getDispatcher() == consoleTextInput) {
-		if(event->getEventCode() == Event::COMPLETE_EVENT && event->getEventType() == "Event") {
+		if(event->getEventCode() == Event::COMPLETE_EVENT && event->getEventType() == "") {
 			_print(">"+consoleTextInput->getText()+"\n");
 			_print(">"+consoleTextInput->getText()+"\n");
 			if(debugger) {
 			if(debugger) {
 				if(!debugger->isConnected()) {
 				if(!debugger->isConnected()) {

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

@@ -753,7 +753,7 @@ void PolycodeMaterialEditor::saveFile() {
 
 
 void PolycodeMaterialEditor::handleEvent(Event *event) {
 void PolycodeMaterialEditor::handleEvent(Event *event) {
 
 
-	if(event->getDispatcher() == mainWindow->materialPane && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == mainWindow->materialPane && event->getEventType() == "" && event->getEventCode() == Event::CHANGE_EVENT) {
 		if(selectedMaterialNode && mainWindow->materialPane->currentMaterial) {
 		if(selectedMaterialNode && mainWindow->materialPane->currentMaterial) {
 			selectedMaterialNode->setLabelText(mainWindow->materialPane->currentMaterial->getName());
 			selectedMaterialNode->setLabelText(mainWindow->materialPane->currentMaterial->getName());
 		}
 		}
@@ -767,7 +767,7 @@ void PolycodeMaterialEditor::handleEvent(Event *event) {
 		
 		
 
 
 	if(event->getDispatcher() == materialBrowser) {
 	if(event->getDispatcher() == materialBrowser) {
-		if(event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+		if(event->getEventType() == "" && event->getEventCode() == Event::CHANGE_EVENT) {
 			if(materialBrowser->selectedData)  {
 			if(materialBrowser->selectedData)  {
 				if(materialBrowser->selectedData->material) {
 				if(materialBrowser->selectedData->material) {
 					mainWindow->materialPane->setMaterial(materialBrowser->selectedData->material);
 					mainWindow->materialPane->setMaterial(materialBrowser->selectedData->material);

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

@@ -99,7 +99,7 @@ void PropList::Resize(Number width, Number height) {
 }
 }
 
 
 void PropList::handleEvent(Event *event) {
 void PropList::handleEvent(Event *event) {
-	if(event->getEventType() == "Event" && event->getEventCode() == Event::COMPLETE_EVENT) {
+	if(event->getEventType() == "" && event->getEventCode() == Event::COMPLETE_EVENT) {
 		Resize(width, height);
 		Resize(width, height);
 	}	
 	}	
 }
 }
@@ -829,31 +829,31 @@ void ShapeSheet::handleEvent(Event *event) {
 		return;
 		return;
 
 
 
 
-	if(event->getDispatcher() == strokeProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == strokeProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastStrokeVal = strokeProp->get();
 		lastStrokeVal = strokeProp->get();
 		shape->strokeEnabled = lastStrokeVal;
 		shape->strokeEnabled = lastStrokeVal;
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}
 	}
 
 
-	if(event->getDispatcher() == shapeSize && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == shapeSize  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastShapeSize = shapeSize->get();
 		lastShapeSize = shapeSize->get();
 		shape->setShapeSize(lastShapeSize.x, lastShapeSize.y);
 		shape->setShapeSize(lastShapeSize.x, lastShapeSize.y);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}
 	}
 
 
-	if(event->getDispatcher() == typeProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == typeProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastShapeType = typeProp->get();
 		lastShapeType = typeProp->get();
 		shape->setShapeType(lastShapeType+1);
 		shape->setShapeType(lastShapeType+1);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}
 	}
 	
 	
-	if(event->getDispatcher() == strokeColorProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == strokeColorProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastStrokeColor = strokeColorProp->get();
 		lastStrokeColor = strokeColorProp->get();
 		shape->strokeColor = lastStrokeColor;
 		shape->strokeColor = lastStrokeColor;
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}
 	}
 
 
-	if(event->getDispatcher() == strokeSize && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == strokeSize  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastStrokeSize = strokeSize->get();
 		lastStrokeSize = strokeSize->get();
 		shape->strokeWidth = lastStrokeSize;
 		shape->strokeWidth = lastStrokeSize;
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
@@ -926,24 +926,24 @@ void EntitySheet::handleEvent(Event *event) {
 	if(!entity)
 	if(!entity)
 		return;
 		return;
 
 
-	if(event->getDispatcher() == blendingProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == blendingProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		entity->blendingMode = blendingProp->get();
 		entity->blendingMode = blendingProp->get();
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}
 	}
 
 
 
 
-	if(event->getDispatcher() == colorProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == colorProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		entity->color = colorProp->get();
 		entity->color = colorProp->get();
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}
 	}
 
 
 		
 		
-	if(event->getDispatcher() == idProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == idProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		entity->id = idProp->get();
 		entity->id = idProp->get();
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}
 	}
 
 
-	if(event->getDispatcher() == tagProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == tagProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		
 		
 		entity->clearTags();
 		entity->clearTags();
 		String cleaned =  tagProp->get().replace(" ", "");
 		String cleaned =  tagProp->get().replace(" ", "");
@@ -1060,27 +1060,27 @@ void ScreenParticleSheet::handleEvent(Event *event) {
 	if(!emitter)
 	if(!emitter)
 		return;
 		return;
 		
 		
-	if(event->getDispatcher() == blendingProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == blendingProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		emitter->setParticleBlendingMode(blendingProp->get());
 		emitter->setParticleBlendingMode(blendingProp->get());
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}
 	}
 		
 		
 
 
-	if(event->getDispatcher() == sizeProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == sizeProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastSize = Vector3(sizeProp->get().x, sizeProp->get().y, 0.0);
 		lastSize = Vector3(sizeProp->get().x, sizeProp->get().y, 0.0);
 		emitter->emitterRadius = lastSize;
 		emitter->emitterRadius = lastSize;
 		emitter->resetAll();		
 		emitter->resetAll();		
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}
 	}
 	
 	
-	if(event->getDispatcher() == dirProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == dirProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastDir = Vector3(dirProp->get().x, dirProp->get().y, 0.0);
 		lastDir = Vector3(dirProp->get().x, dirProp->get().y, 0.0);
 		emitter->dirVector = lastDir;
 		emitter->dirVector = lastDir;
 		emitter->resetAll();
 		emitter->resetAll();
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}
 	}
 
 
-	if(event->getDispatcher() == gravProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == gravProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastGrav = Vector3(gravProp->get().x, gravProp->get().y, 0.0);
 		lastGrav = Vector3(gravProp->get().x, gravProp->get().y, 0.0);
 		emitter->gravVector = lastGrav;
 		emitter->gravVector = lastGrav;
 		emitter->resetAll();
 		emitter->resetAll();
@@ -1088,54 +1088,54 @@ void ScreenParticleSheet::handleEvent(Event *event) {
 	}
 	}
 
 
 
 
-	if(event->getDispatcher() == deviationProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == deviationProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastDeviation = Vector3(deviationProp->get().x, deviationProp->get().y, 0.0);
 		lastDeviation = Vector3(deviationProp->get().x, deviationProp->get().y, 0.0);
 		emitter->deviation = lastDeviation;
 		emitter->deviation = lastDeviation;
 		emitter->resetAll();		
 		emitter->resetAll();		
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}
 	}
 	
 	
-	if(event->getDispatcher() == particleScaleProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == particleScaleProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastParticleScale = particleScaleProp->get();
 		lastParticleScale = particleScaleProp->get();
 		emitter->particleSize = lastParticleScale;
 		emitter->particleSize = lastParticleScale;
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}	
 	}	
 
 
-	if(event->getDispatcher() == brightnessDeviationProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == brightnessDeviationProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastBrightnessDeviation = brightnessDeviationProp->get();
 		lastBrightnessDeviation = brightnessDeviationProp->get();
 		emitter->brightnessDeviation = lastBrightnessDeviation;
 		emitter->brightnessDeviation = lastBrightnessDeviation;
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}
 	}
 	
 	
-	if(event->getDispatcher() == perlinModSizeProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == perlinModSizeProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastPerlinSize = perlinModSizeProp->get();
 		lastPerlinSize = perlinModSizeProp->get();
 		emitter->perlinModSize = lastPerlinSize;
 		emitter->perlinModSize = lastPerlinSize;
 		emitter->resetAll();		
 		emitter->resetAll();		
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}	
 	}	
 	
 	
-	if(event->getDispatcher() == speedModProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == speedModProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastSpeedMod = speedModProp->get();
 		lastSpeedMod = speedModProp->get();
 		emitter->particleSpeedMod = lastSpeedMod;
 		emitter->particleSpeedMod = lastSpeedMod;
 		emitter->resetAll();		
 		emitter->resetAll();		
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}		
 	}		
 
 
-	if(event->getDispatcher() == perlinEnableProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == perlinEnableProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastEnableProp = perlinEnableProp->get();
 		lastEnableProp = perlinEnableProp->get();
 		emitter->perlinEnabled = lastEnableProp;
 		emitter->perlinEnabled = lastEnableProp;
 		emitter->resetAll();		
 		emitter->resetAll();		
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}	
 	}	
 	
 	
-	if(event->getDispatcher() == lifespanProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == lifespanProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastLifespan = lifespanProp->get();
 		lastLifespan = lifespanProp->get();
 		emitter->lifespan = lastLifespan;
 		emitter->lifespan = lastLifespan;
 		emitter->resetAll();
 		emitter->resetAll();
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}		
 	}		
 
 
-	if(event->getDispatcher() == numParticlesProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == numParticlesProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastNumParticles = numParticlesProp->get();
 		lastNumParticles = numParticlesProp->get();
 		emitter->setParticleCount(lastNumParticles);
 		emitter->setParticleCount(lastNumParticles);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
@@ -1147,26 +1147,26 @@ void ScreenParticleSheet::handleEvent(Event *event) {
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}			
 	}			
 
 
-	if(event->getDispatcher() == rotationSpeedProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == rotationSpeedProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastRotationSpeed = rotationSpeedProp->get();
 		lastRotationSpeed = rotationSpeedProp->get();
 		emitter->rotationSpeed = lastRotationSpeed;		
 		emitter->rotationSpeed = lastRotationSpeed;		
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}	
 	}	
 	
 	
-	if(event->getDispatcher() == rotationFollowsPathProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == rotationFollowsPathProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastRotationFollowsPath = rotationFollowsPathProp->get();
 		lastRotationFollowsPath = rotationFollowsPathProp->get();
 		emitter->rotationFollowsPath = lastRotationFollowsPath;		
 		emitter->rotationFollowsPath = lastRotationFollowsPath;		
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}	
 	}	
 	
 	
 	
 	
-	if(event->getDispatcher() == useScaleCurvesProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == useScaleCurvesProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastUseScaleCurves = useScaleCurvesProp->get();
 		lastUseScaleCurves = useScaleCurvesProp->get();
 		emitter->useScaleCurves = lastUseScaleCurves;		
 		emitter->useScaleCurves = lastUseScaleCurves;		
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}		
 	}		
 
 
-	if(event->getDispatcher() == useColorCurvesProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == useColorCurvesProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastUseColorCurves = useColorCurvesProp->get();
 		lastUseColorCurves = useColorCurvesProp->get();
 		emitter->useColorCurves = lastUseColorCurves;		
 		emitter->useColorCurves = lastUseColorCurves;		
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
@@ -1307,19 +1307,19 @@ void Transform2DSheet::handleEvent(Event *event) {
 	if(!entity)
 	if(!entity)
 		return;
 		return;
 
 
-	if(event->getDispatcher() == positionProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == positionProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastPositon = positionProp->get();
 		lastPositon = positionProp->get();
 		entity->setPosition(lastPositon);
 		entity->setPosition(lastPositon);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}
 	}
 
 
-	if(event->getDispatcher() == scaleProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == scaleProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastScale = scaleProp->get();
 		lastScale = scaleProp->get();
 		entity->setScale(lastScale);
 		entity->setScale(lastScale);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}
 	}
 
 
-	if(event->getDispatcher() == rotationProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == rotationProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastRotation = rotationProp->get();
 		lastRotation = rotationProp->get();
 		entity->setRotation(lastRotation);
 		entity->setRotation(lastRotation);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
@@ -1654,29 +1654,29 @@ void SoundSheet::handleEvent(Event *event) {
 	if(!sound)
 	if(!sound)
 		return;
 		return;
 
 
-	if(event->getDispatcher() == referenceDistance && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == referenceDistance  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastReferenceDistance = referenceDistance->get();
 		lastReferenceDistance = referenceDistance->get();
 		sound->getSound()->setReferenceDistance(lastReferenceDistance);
 		sound->getSound()->setReferenceDistance(lastReferenceDistance);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}
 	}
 
 
-	if(event->getDispatcher() == maxDistance && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == maxDistance  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastMaxDistance = maxDistance->get();
 		lastMaxDistance = maxDistance->get();
 		sound->getSound()->setMaxDistance(lastMaxDistance);
 		sound->getSound()->setMaxDistance(lastMaxDistance);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 		dispatchEvent(new Event(), Event::CHANGE_EVENT);
 	}
 	}
 
 
-	if(event->getDispatcher() == volume && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == volume  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastVolume = volume->get();
 		lastVolume = volume->get();
 		sound->getSound()->setVolume(lastVolume);
 		sound->getSound()->setVolume(lastVolume);
 	}
 	}
 
 
-	if(event->getDispatcher() == pitch && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == pitch  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastPitch = pitch->get();
 		lastPitch = pitch->get();
 		sound->getSound()->setPitch(lastPitch);
 		sound->getSound()->setPitch(lastPitch);
 	}
 	}
 
 
-	if(event->getDispatcher() == soundProp && event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getDispatcher() == soundProp  && event->getEventCode() == Event::CHANGE_EVENT) {
 		lastSoundPath = soundProp->get();
 		lastSoundPath = soundProp->get();
 		sound->getSound()->loadFile(lastSoundPath);
 		sound->getSound()->loadFile(lastSoundPath);
 	}
 	}

+ 1 - 1
IDE/Contents/Source/PolycodeRemoteDebugger.cpp

@@ -24,7 +24,7 @@
 
 
 
 
 PolycodeRemoteDebugger::PolycodeRemoteDebugger(PolycodeProjectManager *projectManager) {
 PolycodeRemoteDebugger::PolycodeRemoteDebugger(PolycodeProjectManager *projectManager) {
-	server = new Server(4630, 1);
+	server = new Server(4630, 100);
 	
 	
 	this->projectManager = projectManager;
 	this->projectManager = projectManager;
 
 

+ 4 - 4
IDE/Contents/Source/PolycodeScreenEditor.cpp

@@ -1566,7 +1566,7 @@ void PolycodeScreenEditorMain::handleEvent(Event *event) {
 		}
 		}
 	}
 	}
 
 
-	if(event->getDispatcher() == particleSheet && event->getEventType() == "Event") {	
+	if(event->getDispatcher() == particleSheet && event->getEventType() == "") {	
 		if(particleSheet->emitter) {
 		if(particleSheet->emitter) {
 		ScreenShape *refRect = (ScreenShape*) particleSheet->emitter->getEntityById("refRect", false);
 		ScreenShape *refRect = (ScreenShape*) particleSheet->emitter->getEntityById("refRect", false);
 		if(refRect) {
 		if(refRect) {
@@ -1578,7 +1578,7 @@ void PolycodeScreenEditorMain::handleEvent(Event *event) {
 
 
 	}
 	}
 	
 	
-	if(event->getDispatcher() == soundSheet && event->getEventType() == "Event") {	
+	if(event->getDispatcher() == soundSheet && event->getEventType() == "") {	
 		ScreenShape *refCircle = (ScreenShape*) soundSheet->sound->getEntityById("refCircle", false);
 		ScreenShape *refCircle = (ScreenShape*) soundSheet->sound->getEntityById("refCircle", false);
 		if(refCircle) {
 		if(refCircle) {
 			refCircle->setShapeSize(soundSheet->sound->getSound()->getReferenceDistance(), soundSheet->sound->getSound()->getReferenceDistance());
 			refCircle->setShapeSize(soundSheet->sound->getSound()->getReferenceDistance(), soundSheet->sound->getSound()->getReferenceDistance());
@@ -1592,7 +1592,7 @@ void PolycodeScreenEditorMain::handleEvent(Event *event) {
 		
 		
 	}
 	}
 	
 	
-	if((event->getDispatcher() == transform2dSheet || event->getDispatcher() == labelSheet || event->getDispatcher() == imageSheet) && event->getEventType() == "Event") {
+	if((event->getDispatcher() == transform2dSheet || event->getDispatcher() == labelSheet || event->getDispatcher() == imageSheet) && event->getEventType() == "") {
 		syncTransformToSelected();
 		syncTransformToSelected();
 		treeView->Refresh();		
 		treeView->Refresh();		
 	}
 	}
@@ -2254,7 +2254,7 @@ void PolycodeScreenEditor::saveFile() {
 
 
 void PolycodeScreenEditor::handleEvent(Event *event) {
 void PolycodeScreenEditor::handleEvent(Event *event) {
 
 
-	if(event->getEventType() == "Event" && event->getEventCode() == Event::CHANGE_EVENT) {
+	if(event->getEventType() == "" && event->getEventCode() == Event::CHANGE_EVENT) {
 		if(event->getDispatcher() == treeView) {			
 		if(event->getDispatcher() == treeView) {			
 			editorMain->selectEntity((ScreenEntity*)treeView->selectedEntity);
 			editorMain->selectEntity((ScreenEntity*)treeView->selectedEntity);
 		}
 		}

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

@@ -256,7 +256,7 @@ void PolycodeTextEditor::handleEvent(Event *event) {
 	}
 	}
 
 
 	if(event->getDispatcher() == findBar->replaceInput) {
 	if(event->getDispatcher() == findBar->replaceInput) {
-		if(event->getEventType() == "Event") {
+		if(event->getEventType() == "") {
 		
 		
 			if(event->getEventCode() == Event::CANCEL_EVENT) {
 			if(event->getEventCode() == Event::CANCEL_EVENT) {
 				hideFindBar();
 				hideFindBar();
@@ -271,7 +271,7 @@ void PolycodeTextEditor::handleEvent(Event *event) {
 	
 	
 	
 	
 	if(event->getDispatcher() == findBar->findInput) {
 	if(event->getDispatcher() == findBar->findInput) {
-		if(event->getEventType() == "Event") {
+		if(event->getEventType() == "") {
 		
 		
 			if(event->getEventCode() == Event::CANCEL_EVENT) {
 			if(event->getEventCode() == Event::CANCEL_EVENT) {
 				hideFindBar();
 				hideFindBar();

+ 10 - 1
Modules/Contents/UI/Source/PolyUIBox.cpp

@@ -111,5 +111,14 @@ void UIBox::resizeBox(Number newWidth, Number newHeight) {
 }
 }
 
 
 UIBox::~UIBox() {
 UIBox::~UIBox() {
-	
+	delete tlImage;
+	delete trImage;		
+	delete blImage;		
+	delete brImage;					
+	delete centerImage;		
+	delete tImage;
+	delete rImage;
+	delete bImage;
+	delete lImage;		
+
 }
 }

+ 4 - 12
Modules/Contents/UI/Source/PolyUITree.cpp

@@ -54,18 +54,6 @@ UITree::UITree(String icon, String text, Number treeWidth, Number treeOffset) :
 								fontName,
 								fontName,
 								Label::ANTIALIAS_FULL);
 								Label::ANTIALIAS_FULL);
 
 
-/*	
-	Number st = conf->getNumericValue("Polycode", "uiTreeCellSkinT");
-	Number sr = conf->getNumericValue("Polycode", "uiTreeCellSkinR");
-	Number sb = conf->getNumericValue("Polycode", "uiTreeCellSkinB");
-	Number sl = conf->getNumericValue("Polycode", "uiTreeCellSkinL");	
-	
-	Number padding = conf->getNumericValue("Polycode", "uiTreeCellSkinPadding");	
-	
-	bgBox = new UIBox(conf->getStringValue("Polycode", "uiTreeCellSkin"),
-						  st,sr,sb,sl,
-						  treeWidth+(padding*2), cellHeight+(padding*2));	
-	*/
 	bgBox = new ScreenShape(ScreenShape::SHAPE_RECT, treeWidth, cellHeight);	
 	bgBox = new ScreenShape(ScreenShape::SHAPE_RECT, treeWidth, cellHeight);	
 	bgBox->setPositionMode(ScreenEntity::POSITION_TOPLEFT);
 	bgBox->setPositionMode(ScreenEntity::POSITION_TOPLEFT);
 	bgBox->setPosition(-treeOffset,0);	
 	bgBox->setPosition(-treeOffset,0);	
@@ -297,6 +285,10 @@ void UITree::toggleCollapsed() {
 
 
 UITree::~UITree() {
 UITree::~UITree() {
 	clearTree();
 	clearTree();
+	delete selection;
+	delete textLabel;
+	delete iconImage;
+	delete arrowIconImage;
 }
 }
 
 
 void UITree::clearTree() {
 void UITree::clearTree() {

+ 4 - 3
Player/Contents/Source/PolycodePlayer.cpp

@@ -382,12 +382,13 @@ static void dumpstack (lua_State *L) {
 			lua_pushstring(L, moduleDestPath.c_str());
 			lua_pushstring(L, moduleDestPath.c_str());
 			lua_pushstring(L, moduleLoadCall.c_str());			
 			lua_pushstring(L, moduleLoadCall.c_str());			
 			lua_call(L, 2, 2);
 			lua_call(L, 2, 2);
+			
 			lua_setfield(L, LUA_GLOBALSINDEX, "err");								
 			lua_setfield(L, LUA_GLOBALSINDEX, "err");								
 			lua_setfield(L, LUA_GLOBALSINDEX, "f");		
 			lua_setfield(L, LUA_GLOBALSINDEX, "f");		
 
 
-			lua_getfield(L, LUA_GLOBALSINDEX, "print");
-			lua_getfield(L, LUA_GLOBALSINDEX, "err");						
-			lua_call(L, 1, 0);						
+//			lua_getfield(L, LUA_GLOBALSINDEX, "print");
+//			lua_getfield(L, LUA_GLOBALSINDEX, "err");						
+//			lua_call(L, 1, 0);						
 
 
 			printf("SETTING CORE SERVICES\n");			
 			printf("SETTING CORE SERVICES\n");			
 			lua_getfield(L, LUA_GLOBALSINDEX, "f");
 			lua_getfield(L, LUA_GLOBALSINDEX, "f");