minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2024-12-24 17:50:31 +01:00
Code Issues Projects Releases Wiki Activity

Merging r6266 through r6268 from branch releases/1.8 to trunk

Browse Source 
- Spelling fixes
- Makefile adding to CFLAGS instead of replacing them.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6269 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2021-12-05 20:25:26 +00:00
parent 3e61e81b06
commit 73d562d745
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes.txt
View File

@ -334,6 +334,8 @@ Changes in 1.9 (not yet released)
-------------------------- --------------------------
Changes in 1.8.6 Changes in 1.8.6
- Makefile now only adds CFLAGS instead of overwriting them.
- Several spelling fixes (Patch #455). Thanks @J. Puydt
-------------------------- --------------------------
Changes in 1.8.5 (1st November 2021, svn [r6263]) Changes in 1.8.5 (1st November 2021, svn [r6263])

6
source/Irrlicht/CD3D9ParallaxMapRenderer.cpp
View File

@ -185,12 +185,12 @@ namespace video
"mov r0.xy, t0 ; color map \n"\ "mov r0.xy, t0 ; color map \n"\
" \n"\ " \n"\
"; original parallax mapping: \n"\ "; original parallax mapping: \n"\
"; emulate ps1x _bx2, so substract 0.5f and multiply by 2 \n"\ "; emulate ps1x _bx2, so subtract 0.5f and multiply by 2 \n"\
"mad r1.xyz, r1, r11, c0; \n"\ "mad r1.xyz, r1, r11, c0; \n"\
" \n"\ " \n"\
"mul r3, r1.wwww, c6; ; r3 = (height, height, height) * scale \n"\ "mul r3, r1.wwww, c6; ; r3 = (height, height, height) * scale \n"\
" \n"\ " \n"\
"; emulate ps1x _bx2, so substract 0.5f and multiply by 2 \n"\ "; emulate ps1x _bx2, so subtract 0.5f and multiply by 2 \n"\
"mad r4.xyz, r4, r11, c0; \n"\ "mad r4.xyz, r4, r11, c0; \n"\
" \n"\ " \n"\
"mad r2.xy, r3, r4, r0 ; newTexCoord = height * eye + oldTexCoord \n"\ "mad r2.xy, r3, r4, r0 ; newTexCoord = height * eye + oldTexCoord \n"\
@ -205,7 +205,7 @@ namespace video
"mov r2.xyz, t2 ; fetch light vector 1 \n"\ "mov r2.xyz, t2 ; fetch light vector 1 \n"\
"mov r3.xyz, t3 ; fetch light vector 2 \n"\ "mov r3.xyz, t3 ; fetch light vector 2 \n"\
" \n"\ " \n"\
"; emulate ps1x _bx2, so substract 0.5f and multiply by 2 \n"\ "; emulate ps1x _bx2, so subtract 0.5f and multiply by 2 \n"\
"mad r1.xyz, r1, r11, c0; \n"\ "mad r1.xyz, r1, r11, c0; \n"\
"mad r2.xyz, r2, r11, c0; \n"\ "mad r2.xyz, r2, r11, c0; \n"\
"mad r3.xyz, r3, r11, c0; \n"\ "mad r3.xyz, r3, r11, c0; \n"\

2
source/Irrlicht/COpenGLParallaxMapRenderer.cpp
View File

@ -156,7 +156,7 @@ const char OPENGL_PARALLAX_MAP_PSH[] =
"MAD normalMapColor, normalMapColor, {2,2,2,2}, {-1,-1,-1,-1}; \n"\ "MAD normalMapColor, normalMapColor, {2,2,2,2}, {-1,-1,-1,-1}; \n"\
"\n"\ "\n"\
"\n"\ "\n"\
"# extract eye vector (so substract 0.5f and multiply by 2)\n"\ "# extract eye vector (so subtract 0.5f and multiply by 2)\n"\
"MAD temp, eyeVector, {2,2,2,2}, {-1,-1,-1,-1};\n"\ "MAD temp, eyeVector, {2,2,2,2}, {-1,-1,-1,-1};\n"\
"\n"\ "\n"\
"# height = height * scale \n"\ "# height = height * scale \n"\

2
source/Irrlicht/CXMeshFileLoader.cpp
View File

@ -1116,7 +1116,7 @@ bool CXMeshFileLoader::parseDataObjectSkinWeights(SXMesh &mesh)
if (!getNextTokenAsString(TransformNodeName)) if (!getNextTokenAsString(TransformNodeName))
{ {
os::Printer::log("Unknown syntax while reading transfrom node name string in .x file", ELL_WARNING); os::Printer::log("Unknown syntax while reading transform node name string in .x file", ELL_WARNING);
os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING); os::Printer::log("Line", core::stringc(Line).c_str(), ELL_WARNING);
return false; return false;
} }

2
source/Irrlicht/Makefile
View File

@ -85,7 +85,7 @@ endif
ifdef PROFILE ifdef PROFILE
CPPFLAGS += -pg CPPFLAGS += -pg
endif endif
CFLAGS := -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES -DPNG_ARM_NEON_OPT=0 CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES -DPNG_ARM_NEON_OPT=0
sharedlib sharedlib_osx: CPPFLAGS += -fPIC sharedlib sharedlib_osx: CPPFLAGS += -fPIC
# TODO: also necessary on sharedlib_osx? # TODO: also necessary on sharedlib_osx?