update

Author: turanszkij

Editor/ProjectCreatorWindow.cpp

@@ -94,7 +94,7 @@ void ProjectCreatorWindow::Create(EditorComponent* _editor)
 			wi::helper::messageBox("Application name must be provided first!");
 			return;
 		}
-		std::string folder = wi::helper::FolderDialog();
+		std::string folder = wi::helper::FolderDialog("Select location where project folder will be created.");
 		if (folder.empty())
 			return;
 		std::string name = projectNameInput.GetText();
@@ -117,6 +117,7 @@ backlog_post("Hello World!")
 		if (iconResource.IsValid())
 		{
 			wi::helper::saveTextureToFile(iconResource.GetTexture(), directory + "icon.png");
+			wi::helper::saveTextureToFile(iconResource.GetTexture(), directory + "icon.h");
 		}
 		if (thumbnailResource.IsValid())
 		{
@@ -217,6 +218,7 @@ backlog_post("Hello World!")
 				wi::helper::FileWrite(exepath_dst, exedata.data(), exedata.size());
 			}
 		}
+		editor->RegisterRecentlyUsed(directory + scriptfilename);
 		wi::helper::OpenUrl(directory);
 	});
 	AddWidget(&createButton);

Editor/main_SDL2.cpp

@@ -4,7 +4,7 @@
 #include "sdl2.h"
 #include <fstream>
 
-#include "icon.c"
+#include "icon.h"
 
 #ifdef __linux__
 #  include <execinfo.h>
@@ -95,7 +95,7 @@ void set_window_icon(SDL_Window *window) {
     // to assume the data it gets is byte-wise RGB(A) data
     Uint32 rmask, gmask, bmask, amask;
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
-    int shift = (gimp_image.bytes_per_pixel == 3) ? 8 : 0;
+    int shift = (embedded_image.bytes_per_pixel == 3) ? 8 : 0;
     rmask = 0xff000000 >> shift;
     gmask = 0x00ff0000 >> shift;
     bmask = 0x0000ff00 >> shift;
@@ -104,10 +104,10 @@ void set_window_icon(SDL_Window *window) {
     rmask = 0x000000ff;
     gmask = 0x0000ff00;
     bmask = 0x00ff0000;
-    amask = (gimp_image.bytes_per_pixel == 3) ? 0 : 0xff000000;
+    amask = (embedded_image.bytes_per_pixel == 3) ? 0 : 0xff000000;
 #endif
-    SDL_Surface* icon = SDL_CreateRGBSurfaceFrom((void*)gimp_image.pixel_data, gimp_image.width,
-        gimp_image.height, gimp_image.bytes_per_pixel*8, gimp_image.bytes_per_pixel*gimp_image.width,
+    SDL_Surface* icon = SDL_CreateRGBSurfaceFrom((void*)embedded_image.pixel_data, embedded_image.width,
+		embedded_image.height, embedded_image.bytes_per_pixel*8, embedded_image.bytes_per_pixel* embedded_image.width,
         rmask, gmask, bmask, amask);
 
     SDL_SetWindowIcon(window, icon);

WickedEngine/wiHelper.cpp

@@ -824,6 +824,29 @@ namespace wi::helper
 
 			return true;
 		}
+		else if (!extension.compare("H"))
+		{
+			const size_t datasize = mip.width * mip.height * sizeof(wi::Color);
+			std::string ss;
+			ss += "struct EmbeddedImage {\n";
+			ss += "const unsigned int width = " + std::to_string(mip.width) + ";\n";
+			ss += "const unsigned int height = " + std::to_string(mip.height) + ";\n";
+			ss += "const unsigned int bytes_per_pixel = 4;\n";
+			ss += "const char comment[] = \"RGBA Image Header Generated By Wicked Engine\";\n";
+			ss += "const unsigned char pixel_data[] = {";
+			for (size_t i = 0; i < datasize; ++i)
+			{
+				if (i % 32 == 0)
+				{
+					ss += "\n";
+				}
+				ss += std::to_string((uint32_t)mip.address[i]) + ",";
+			}
+			ss += "\n};\n};\n";
+			filedata.resize(ss.size());
+			std::memcpy(filedata.data(), ss.c_str(), ss.length());
+			return true;
+		}
 		else
 		{
 			assert(0 && "Unsupported extension");
@@ -1330,14 +1353,14 @@ namespace wi::helper
 #endif // PLATFORM_LINUX
 	}
 
-	std::string FolderDialog()
+	std::string FolderDialog(const std::string& description)
 	{
 		if (!pfd::settings::available())
 		{
 			messageBox("No dialog backend available!", "Error!");
 			return "";
 		}
-		return pfd::select_folder("Select folder").result();
+		return pfd::select_folder(description).result();
 	}
 
 	void GetFileNamesInDirectory(const std::string& directory, std::function<void(std::string fileName)> onSuccess, const std::string& filter_extension)

WickedEngine/wiHelper.h

@@ -51,16 +51,16 @@ namespace wi::helper
 	// Save raw pixel data from the texture to memory
 	bool saveTextureToMemory(const wi::graphics::Texture& texture, wi::vector<uint8_t>& texturedata);
 
-	// Save texture to memory as a file format (file format is determined by extension, supported extensions: .png, .jpg, .jpeg, .tga, .bmp, .dds, .ico)
+	// Save texture to memory as a file format (file format is determined by extension, supported extensions: .png, .jpg, .jpeg, .tga, .bmp, .dds, .ico, .h)
 	bool saveTextureToMemoryFile(const wi::graphics::Texture& texture, const std::string& fileExtension, wi::vector<uint8_t>& filedata);
 
-	// Save raw texture data to memory as file format (file format is determined by extension, supported extensions: .png, .jpg, .jpeg, .tga, .bmp, .dds, .ico)
+	// Save raw texture data to memory as file format (file format is determined by extension, supported extensions: .png, .jpg, .jpeg, .tga, .bmp, .dds, .ico, .h)
 	bool saveTextureToMemoryFile(const wi::vector<uint8_t>& textureData, const wi::graphics::TextureDesc& desc, const std::string& fileExtension, wi::vector<uint8_t>& filedata);
 
-	// Save texture to file format (file format is determined by extension, supported extensions: .png, .jpg, .jpeg, .tga, .bmp, .dds, .ico)
+	// Save texture to file format (file format is determined by extension, supported extensions: .png, .jpg, .jpeg, .tga, .bmp, .dds, .ico, .h)
 	bool saveTextureToFile(const wi::graphics::Texture& texture, const std::string& fileName);
 
-	// Save raw texture data to file format (file format is determined by extension, supported extensions: .png, .jpg, .jpeg, .tga, .bmp, .dds, .ico)
+	// Save raw texture data to file format (file format is determined by extension, supported extensions: .png, .jpg, .jpeg, .tga, .bmp, .dds, .ico, .h)
 	bool saveTextureToFile(const wi::vector<uint8_t>& texturedata, const wi::graphics::TextureDesc& desc, const std::string& fileName);
 
 	// Download buffer from GPU into CPU memory
@@ -128,7 +128,7 @@ namespace wi::helper
 	};
 	void FileDialog(const FileDialogParams& params, std::function<void(std::string fileName)> onSuccess);
 
-	std::string FolderDialog();
+	std::string FolderDialog(const std::string& description = "Select folder");
 
 	void GetFileNamesInDirectory(const std::string& directory, std::function<void(std::string fileName)> onSuccess, const std::string& filter_extension = "");