Browse Source

Now working and Added initial .HDR support

dragonCASTjosh 9 years ago
parent
commit
103fe32dd1

+ 4 - 3
Source/Urho3D/Resource/Image.cpp

@@ -31,12 +31,13 @@
 
 #include <JO/jo_jpeg.h>
 #include <SDL/SDL_surface.h>
+#define STB_IMAGE_IMPLEMENTATION
+#define STB_IMAGE_WRITE_IMPLEMENTATION
 #include <STB/stb_image.h>
 #include <STB/stb_image_write.h>
-
 #include "../DebugNew.h"
 
-extern "C" unsigned char* stbi_write_png_to_mem(unsigned char* pixels, int stride_bytes, int x, int y, int n, int* out_len);
+//extern "C" unsigned char* stbi_write_png_to_mem(unsigned char* pixels, int stride_bytes, int x, int y, int n, int* out_len);
 
 #ifndef MAKEFOURCC
 #define MAKEFOURCC(ch0, ch1, ch2, ch3) ((unsigned)(ch0) | ((unsigned)(ch1) << 8) | ((unsigned)(ch2) << 16) | ((unsigned)(ch3) << 24))
@@ -2045,5 +2046,5 @@ void Image::FreeImageData(unsigned char* pixelData)
 
     stbi_image_free(pixelData);
 }
-
+ 
 }

+ 5 - 0
bin/Data/Scripts/Editor/EditorResourceBrowser.as

@@ -105,6 +105,7 @@ const StringHash EXTENSION_TYPE_DDS(".dds");
 const StringHash EXTENSION_TYPE_PNG(".png");
 const StringHash EXTENSION_TYPE_JPG(".jpg");
 const StringHash EXTENSION_TYPE_JPEG(".jpeg");
+const StringHash EXTENSION_TYPE_HDR(".hdr");
 const StringHash EXTENSION_TYPE_BMP(".bmp");
 const StringHash EXTENSION_TYPE_TGA(".tga");
 const StringHash EXTENSION_TYPE_KTX(".ktx");
@@ -1156,6 +1157,8 @@ int GetResourceType(StringHash fileType)
         return RESOURCE_TYPE_IMAGE;
     else if(fileType == EXTENSION_TYPE_JPEG)
         return RESOURCE_TYPE_IMAGE;
+    else if(fileType == EXTENSION_TYPE_HDR)
+        return RESOURCE_TYPE_IMAGE;
     else if(fileType == EXTENSION_TYPE_BMP)
         return RESOURCE_TYPE_IMAGE;
     else if(fileType == EXTENSION_TYPE_TGA)
@@ -1209,6 +1212,8 @@ bool GetExtensionType(String path, StringHash &out fileType)
         fileType = EXTENSION_TYPE_JPG;
     else if(type == EXTENSION_TYPE_JPEG)
         fileType = EXTENSION_TYPE_JPEG;
+    else if(type == EXTENSION_TYPE_HDR)
+        fileType =  EXTENSION_TYPE_HDR;    
     else if(type == EXTENSION_TYPE_BMP)
         fileType = EXTENSION_TYPE_BMP;
     else if(type == EXTENSION_TYPE_TGA)