Ivan Safrin 14 лет назад
Родитель
Сommit
0de33d5ac0

+ 4 - 4
Core/Contents/Include/PolyMaterialManager.h

@@ -51,10 +51,10 @@ namespace Polycode {
 			* Creates a new framebuffer texture.
 			*/ 
 			Texture *createFramebufferTexture(int width, int height, int type);
-			Texture *createTexture(int width, int height, char *imageData, bool clamp=true, bool createMipmaps = true, int type=Image::IMAGE_RGBA);
-			Texture *createNewTexture(int width, int height, bool clamp=true, bool createMipmaps = true, int type=Image::IMAGE_RGBA);
-			Texture *createTextureFromImage(Image *image, bool clamp=true, bool createMipmaps = true);
-			Texture *createTextureFromFile(const String& fileName, bool clamp=true, bool createMipmaps = true);
+			Texture *createTexture(int width, int height, char *imageData, bool clamp=false, bool createMipmaps = true, int type=Image::IMAGE_RGBA);
+			Texture *createNewTexture(int width, int height, bool clamp=false, bool createMipmaps = true, int type=Image::IMAGE_RGBA);
+			Texture *createTextureFromImage(Image *image, bool clamp=false, bool createMipmaps = true);
+			Texture *createTextureFromFile(const String& fileName, bool clamp=false, bool createMipmaps = true);
 			void deleteTexture(Texture *texture);
 		
 			void reloadTextures();

+ 12 - 0
IDE/Contents/Resources/FileTemplates/2D/Screen Entity.screen

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<screen>	
+	<entities>
+		<entity type="image" x="100" y="200" rot="35" tint="#ff00ff" alpha="1" scaleX="1" scaleY="1">
+			<image_path>tomato.png</image_path>
+		</entity>
+		<entity type="shape" x="300" y="200" rot="35" tint="#ff00ff" alpha="1" scaleX="1" scaleY="1">
+			<shape type="rect" width="100" height="50" texture="Whatever"></shape>
+			<physics type="static_rect" density="1" friction="1" restitution="0" sensor="false" noRotate="false"></physics>
+		</entity>
+	</entities>
+</screen>

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

@@ -63,9 +63,9 @@ void NewFileWindow::resetForm() {
 void NewFileWindow::parseTemplatesIntoTree(UITree *tree, OSFileEntry folder) {
 	vector<OSFileEntry> templates = OSBasics::parseFolder(folder.fullPath, false);
 	for(int i=0; i < templates.size(); i++) {
-		OSFileEntry entry = templates[i];
+		OSFileEntry entry = templates[i];	
 		if(entry.type != OSFileEntry::TYPE_FOLDER) {
-			UITree *newChild = tree->addTreeChild("templateIcon.png", entry.nameWithoutExtension, NULL);			
+			UITree *newChild = tree->addTreeChild("templateIcon.png", entry.nameWithoutExtension, NULL);
 			FileTemplateUserData *data = new FileTemplateUserData();
 			data->type = 1;
 			data->templateFolder = entry.fullPath;