ci improvements
parent
a2f7d47a2e
commit
5381ee4e68
|
@ -21,3 +21,4 @@ libv4k.*
|
|||
.DS_store
|
||||
*.raddbg
|
||||
plugins
|
||||
tools/assimp-vc*-mt.lib
|
||||
|
|
|
@ -99,6 +99,7 @@ typedef float mat44[16];
|
|||
float signf (float a) ;
|
||||
float clampf (float v,float a,float b);
|
||||
float mixf (float a,float b,float t);
|
||||
float slerpf (float a,float b,float t);
|
||||
float fractf (float a);
|
||||
vec2 ptr2 (const float *a );
|
||||
vec2 neg2 (vec2 a );
|
||||
|
|
|
@ -14952,6 +14952,7 @@ API float pmodf (float a, float b);
|
|||
API float signf (float a) ;
|
||||
API float clampf (float v,float a,float b);
|
||||
API float mixf (float a,float b,float t);
|
||||
API float slerpf (float a,float b,float t);
|
||||
API float fractf (float a);
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -365440,6 +365441,16 @@ float pmodf (float a, float b) { return (a < 0.0f ? 1.0f : 0.0f) + (float)f
|
|||
float signf (float a) { return (a < 0) ? -1.f : 1.f; }
|
||||
float clampf(float v,float a,float b){return maxf(minf(b,v),a); }
|
||||
float mixf(float a,float b,float t) { return a*(1-t)+b*t; }
|
||||
float slerpf(float a,float b,float t) {
|
||||
float diff = b - a;
|
||||
if (diff < 0.0)
|
||||
diff += 360.0;
|
||||
|
||||
float r = a + t*diff;
|
||||
if (r >= 360.0)
|
||||
r -= 360.0;
|
||||
return r;
|
||||
}
|
||||
float fractf (float a) { return a - (int)a; }
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
|
|
@ -90,6 +90,16 @@ float pmodf (float a, float b) { return (a < 0.0f ? 1.0f : 0.0f) + (float)f
|
|||
float signf (float a) { return (a < 0) ? -1.f : 1.f; }
|
||||
float clampf(float v,float a,float b){return maxf(minf(b,v),a); }
|
||||
float mixf(float a,float b,float t) { return a*(1-t)+b*t; }
|
||||
float slerpf(float a,float b,float t) {
|
||||
float diff = b - a;
|
||||
if (diff < 0.0)
|
||||
diff += 360.0;
|
||||
|
||||
float r = a + t*diff;
|
||||
if (r >= 360.0)
|
||||
r -= 360.0;
|
||||
return r;
|
||||
}
|
||||
float fractf (float a) { return a - (int)a; }
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
|
|
@ -64,6 +64,7 @@ API float pmodf (float a, float b);
|
|||
API float signf (float a) ;
|
||||
API float clampf (float v,float a,float b);
|
||||
API float mixf (float a,float b,float t);
|
||||
API float slerpf (float a,float b,float t);
|
||||
API float fractf (float a);
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
|
10
engine/v4k.c
10
engine/v4k.c
|
@ -12579,6 +12579,16 @@ float pmodf (float a, float b) { return (a < 0.0f ? 1.0f : 0.0f) + (float)f
|
|||
float signf (float a) { return (a < 0) ? -1.f : 1.f; }
|
||||
float clampf(float v,float a,float b){return maxf(minf(b,v),a); }
|
||||
float mixf(float a,float b,float t) { return a*(1-t)+b*t; }
|
||||
float slerpf(float a,float b,float t) {
|
||||
float diff = b - a;
|
||||
if (diff < 0.0)
|
||||
diff += 360.0;
|
||||
|
||||
float r = a + t*diff;
|
||||
if (r >= 360.0)
|
||||
r -= 360.0;
|
||||
return r;
|
||||
}
|
||||
float fractf (float a) { return a - (int)a; }
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
|
|
@ -1019,6 +1019,7 @@ API float pmodf (float a, float b);
|
|||
API float signf (float a) ;
|
||||
API float clampf (float v,float a,float b);
|
||||
API float mixf (float a,float b,float t);
|
||||
API float slerpf (float a,float b,float t);
|
||||
API float fractf (float a);
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
|
Binary file not shown.
|
@ -1,38 +0,0 @@
|
|||
#!/bin/bash 2>nul || goto :windows
|
||||
|
||||
# linux + osx -----------------------------------------------------------------
|
||||
cd `dirname $0`
|
||||
|
||||
git clone https://github.com/assimp/assimp && cd assimp && git checkout 05115b07
|
||||
cmake -DCMAKE_BUILD_TYPE=Release -DASSIMP_BUILD_TESTS=OFF .
|
||||
make -j 8
|
||||
cp bin/libassimp.so ../libassimp.so
|
||||
cp bin/libassimp.so ../libassimp.so.5
|
||||
cp bin/libassimp.so ../libassimp.so.5.1.4
|
||||
cd ..
|
||||
cc ass2iqe.c -o ass2iqe.linux -O2 -I assimp/include/ libassimp.so -lm
|
||||
|
||||
exit
|
||||
|
||||
|
||||
:windows -----------------------------------------------------------------------
|
||||
@echo off
|
||||
cd "%~dp0"
|
||||
|
||||
git clone https://github.com/assimp/assimp && pushd assimp && git checkout 05115b07 && popd && md assimp\.build && pushd assimp\.build
|
||||
rem fart -- ..\CMakeLists.txt assimp-${ASSIMP_MSVC_VERSION}-mt.dll assimp.dll
|
||||
rem fart -- ..\CMakeLists.txt assimp-${ASSIMP_MSVC_VERSION}-mt.lib assimp.lib
|
||||
rem cmake .. -DCMAKE_BUILD_TYPE=Release -G "Visual Studio 14 2015" && msbuild assimp.sln -m -p:Configuration=Release -p:PlatformToolset=140
|
||||
cmake .. -DCMAKE_BUILD_TYPE=Release && (make || msbuild assimp.sln -m -p:Configuration=Release)
|
||||
popd
|
||||
|
||||
xcopy /y assimp\.build\bin\release\*.dll
|
||||
xcopy /y assimp\.build\lib\release\*.lib
|
||||
|
||||
copy /y assimp\include\assimp\config.h.in assimp\config.h && fart -- assimp\config.h "cmakedefine" "//#define"
|
||||
cl ass2iqe.c -I . -I assimp\include assimp-vc143-mt.lib /O2 /Oy /MT /DNDEBUG
|
||||
|
||||
rem xcopy assimp\.build\bin\release\*.dll x64\ /s
|
||||
rem xcopy assimp\.build\lib\release\*.lib x64\ /s
|
||||
rem rd /q /s assimp
|
||||
rem fart -r -- * "assimp/" "3rd/3rd_assimp/"
|
Loading…
Reference in New Issue