Load cubemap images better;

src/api/data.c

@@ -117,7 +117,7 @@ int l_lovrDataNewTextureData(lua_State* L) {
     textureData = lovrTextureDataCreate(width, height, 0x0, format);
   } else {
     Blob* blob = luax_readblob(L, 1, "Texture");
-    textureData = lovrTextureDataCreateFromBlob(blob);
+    textureData = lovrTextureDataCreateFromBlob(blob, true);
     lovrRelease(blob);
   }
 

src/api/graphics.c

@@ -238,12 +238,12 @@ static void stencilCallback(void* userdata) {
   lua_call(L, 0, 0);
 }
 
-static TextureData* luax_checktexturedata(lua_State* L, int index) {
+static TextureData* luax_checktexturedata(lua_State* L, int index, bool flip) {
   TextureData* textureData = luax_totype(L, index, TextureData);
 
   if (!textureData) {
     Blob* blob = luax_readblob(L, index, "Texture");
-    textureData = lovrTextureDataCreateFromBlob(blob);
+    textureData = lovrTextureDataCreateFromBlob(blob, flip);
     lovrRelease(blob);
   }
 
@@ -1041,7 +1041,7 @@ int l_lovrGraphicsNewMaterial(lua_State* L) {
 
   if (lua_type(L, index) == LUA_TSTRING) {
     Blob* blob = luax_readblob(L, index++, "Texture");
-    TextureData* textureData = lovrTextureDataCreateFromBlob(blob);
+    TextureData* textureData = lovrTextureDataCreateFromBlob(blob, true);
     Texture* texture = lovrTextureCreate(TEXTURE_2D, &textureData, 1, true, true, 0);
     lovrMaterialSetTexture(material, TEXTURE_DIFFUSE, texture);
     lovrRelease(blob);
@@ -1136,7 +1136,7 @@ int l_lovrGraphicsNewModel(lua_State* L) {
   if (lua_gettop(L) >= 2) {
     if (lua_type(L, 2) == LUA_TSTRING) {
       Blob* blob = luax_readblob(L, 2, "Texture");
-      TextureData* textureData = lovrTextureDataCreateFromBlob(blob);
+      TextureData* textureData = lovrTextureDataCreateFromBlob(blob, true);
       Texture* texture = lovrTextureCreate(TEXTURE_2D, &textureData, 1, true, true, 0);
       Material* material = lovrMaterialCreate();
       lovrMaterialSetTexture(material, TEXTURE_DIFFUSE, texture);
@@ -1260,7 +1260,7 @@ int l_lovrGraphicsNewTexture(lua_State* L) {
   } else {
     if (type == TEXTURE_CUBE && depth == 0) {
       depth = 6;
-      const char* faces[6] = { "right", "left", "bottom", "top", "back", "front" };
+      const char* faces[6] = { "right", "left", "top", "bottom", "back", "front" };
       for (int i = 0; i < 6; i++) {
         lua_pushstring(L, faces[i]);
         lua_rawget(L, 1);
@@ -1270,7 +1270,7 @@ int l_lovrGraphicsNewTexture(lua_State* L) {
 
     for (int i = 0; i < depth; i++) {
       lua_rawgeti(L, 1, i + 1);
-      TextureData* textureData = luax_checktexturedata(L, -1);
+      TextureData* textureData = luax_checktexturedata(L, -1, type != TEXTURE_CUBE);
       if (i == 0) {
         lovrTextureAllocate(texture, textureData->width, textureData->height, depth, textureData->format);
       }

src/data/modelData.c

@@ -146,7 +146,7 @@ static int readMaterialTexture(struct aiMaterial* assimpMaterial, enum aiTexture
   }
 
   Blob* blob = lovrBlobCreate(data, size, path);
-  TextureData* textureData = lovrTextureDataCreateFromBlob(blob);
+  TextureData* textureData = lovrTextureDataCreateFromBlob(blob, true);
   lovrRelease(blob);
   int textureIndex = modelData->textures.length;
   vec_push(&modelData->textures, textureData);

src/data/textureData.c

@@ -151,7 +151,7 @@ TextureData* lovrTextureDataCreate(int width, int height, uint8_t value, Texture
   return textureData;
 }
 
-TextureData* lovrTextureDataCreateFromBlob(Blob* blob) {
+TextureData* lovrTextureDataCreateFromBlob(Blob* blob, bool flip) {
   TextureData* textureData = lovrAlloc(TextureData, lovrTextureDataDestroy);
   if (!textureData) return NULL;
 
@@ -163,7 +163,7 @@ TextureData* lovrTextureDataCreateFromBlob(Blob* blob) {
     return textureData;
   }
 
-  stbi_set_flip_vertically_on_load(1);
+  stbi_set_flip_vertically_on_load(flip);
   if (stbi_is_hdr_from_memory(blob->data, blob->size)) {
     textureData->format = FORMAT_RGBA32F;
     textureData->blob.data = stbi_loadf_from_memory(blob->data, blob->size, &textureData->width, &textureData->height, NULL, 4);

src/data/textureData.h

@@ -42,7 +42,7 @@ typedef struct {
 } TextureData;
 
 TextureData* lovrTextureDataCreate(int width, int height, uint8_t value, TextureFormat format);
-TextureData* lovrTextureDataCreateFromBlob(Blob* blob);
+TextureData* lovrTextureDataCreateFromBlob(Blob* blob, bool flip);
 Color lovrTextureDataGetPixel(TextureData* textureData, int x, int y);
 void lovrTextureDataSetPixel(TextureData* textureData, int x, int y, Color color);
 bool lovrTextureDataEncode(TextureData* textureData, const char* filename);

src/resources/shaders.c

@@ -107,7 +107,7 @@ const char* lovrDefaultFragmentShader = ""
 const char* lovrCubeVertexShader = ""
 "out vec3 texturePosition[2]; \n"
 "vec4 position(mat4 projection, mat4 transform, vec4 vertex) { \n"
-"  texturePosition[lovrViewportIndex] = -inverse(mat3(transform)) * (inverse(projection) * vertex).xyz; \n"
+"  texturePosition[lovrViewportIndex] = inverse(mat3(transform)) * (inverse(projection) * vertex).xyz; \n"
 "  return vertex; \n"
 "}";
 
@@ -122,8 +122,8 @@ const char* lovrPanoFragmentShader = ""
 "#define PI 3.141592653589 \n"
 "vec4 color(vec4 graphicsColor, sampler2D image, vec2 uv) { \n"
 "  vec3 direction = texturePosition[lovrViewportIndex]; \n"
-"  float theta = acos(direction.y / length(direction)); \n"
-"  float phi = atan(-direction.x, direction.z); \n"
+"  float theta = acos(-direction.y / length(direction)); \n"
+"  float phi = atan(direction.x, -direction.z); \n"
 "  uv = vec2(.5 + phi / (2. * PI), theta / PI); \n"
 "  return graphicsColor * texture(lovrDiffuseTexture, uv); \n"
 "}";