Merge commit '482b161b63b33bf4ad5ff0553247e4807a7b3ff1'

marcel303 · May 19, 2022 · 3f4f835 · 3f4f835
2 parents 319a1ef + 482b161
commit 3f4f835
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/chibi b/chibi
diff --git a/framework/image.cpp b/framework/image.cpp
@@ -87,10 +87,12 @@ ImageData * loadImage_qoi(const char * filename)
  {
  Assert(desc.channels == 4);
 
- imageData = new ImageData();
- imageData->sx = desc.width;
- imageData->sy = desc.height;
- imageData->imageData = (ImageData::Pixel*)data;
+ imageData = new ImageData(desc.width, desc.height);
+
+ memcpy(imageData->imageData, data, desc.width * desc.height * 4);
+
+ free(data);
+ data = nullptr;
  }
 
  return imageData;

diff --git a/users/marcel/lgen-origin/main.cpp b/users/marcel/lgen-origin/main.cpp
@@ -17,12 +17,6 @@
 
 //---------------------------------------------------------------------------
 
-#if !defined(ALLEGRO_DJGPP) && !defined(ALLEGRO_MINGW32)
-#warning compiling for an untested platform! it is possible you will run into unexpected trouble..
-#endif
-
-//---------------------------------------------------------------------------
-
 #define PAL_COL(_p, _i, _r, _g, _b) _i = makecol(_r, _g, _b)
 
 //---------------------------------------------------------------------------

diff --git a/users/marcel/ovr-cubes/main6.cpp b/users/marcel/ovr-cubes/main6.cpp
@@ -33,6 +33,8 @@
 #include "Path.h" // GetExtension for jgmod file listing
 #include "Quat.h"
 
+#include <algorithm>
+
 /*
 
 new challenges!

diff --git a/users/marcel/xenocollide-testbed/Math/Math.h b/users/marcel/xenocollide-testbed/Math/Math.h
@@ -411,13 +411,13 @@ inline float32 RadToDeg(float32 rad)
 inline float32 Sqrt(const float32 a)
 {
  ASSERT(a >= 0.f);
- return _mm_sqrt_ss(_mm_set_ps1(a))[0];
+ return _mm_extract_ps(_mm_sqrt_ss(_mm_set_ps1(a)), 0);
 }
 inline float32 InvSqrt (const float32 a)
 {
  ASSERT(a > 0.f);
  static __m128 s_ssevec1 = _mm_set_ps1(1.f);
- return _mm_div_ss(s_ssevec1,_mm_sqrt_ss(_mm_set_ps1(a)))[0];
+ return _mm_extract_ps(_mm_div_ss(s_ssevec1,_mm_sqrt_ss(_mm_set_ps1(a))), 0);
 }
 
 inline Euler::Euler(const Matrix& m)
@@ -823,7 +823,7 @@ inline float64 Abs(float64 a)
 
 inline Vector64 CompAbs(const Vector64& a)
 {
- return Vector64(abs(a.X()), abs(a.Y()), abs(a.Z()));
+ return Vector64(Abs(a.X()), Abs(a.Y()), Abs(a.Z()));
 }
 
 inline Vector64 CompMin(const Vector64& a, const Vector64& b)

diff --git a/users/marcel/xenocollide-testbed/TestModule.h b/users/marcel/xenocollide-testbed/TestModule.h
@@ -47,7 +47,7 @@ class TestModule
  virtual void OnRightButtonUp(const Vector& rayOrigin, const Vector& rayDirection, const Vector& point) {};
  virtual void OnMouseMove(const Vector& rayOrigin, const Vector& rayDirection, const Vector& point) {};
 
- virtual const Vector& GetBackgroundColor() {};
+ virtual const Vector& GetBackgroundColor() { static Vector result; return result; };
 
 };
 

diff --git a/users/marcel/xenocollide-testbed/Tests/TestXenoCollide/RenderPolytope.cpp b/users/marcel/xenocollide-testbed/Tests/TestXenoCollide/RenderPolytope.cpp
@@ -20,6 +20,7 @@ not be misrepresented as being the original software.
 
 #include <stdio.h>
 #include <map>
+#include <assert.h>
 
 #include "DrawUtil.h"
 #include "HullMaker.h"