Merge branch 'master' into erfan_cubemap_render

Erfan-Ahmadi · Erfan-Ahmadi · commit e40c38d7faea · 2022-01-15T10:48:43.000+03:30
diff --git a/examples_tests/22.RaytracedAO/test.bat b/examples_tests/22.RaytracedAO/test.bat
@@ -1,6 +1,7 @@
 @echo off
 
 set pathtracer="%~dp0/bin/raytracedao.exe"
+set scenesInput="%~dp0/test_scenes.txt"
 
 pushd bin
 if NOT EXIST %pathtracer% (
@@ -10,7 +11,7 @@ if NOT EXIST %pathtracer% (
 )
 popd
 
-for /f "tokens=*" %%s in ('findstr /v /c:";" test_scenes.txt') do (
+for /f "tokens=*" %%s in ('findstr /v /c:";" %scenesInput%') do (
     REM echo %%s
     Call :render_and_denoise %%s
 )
diff --git a/include/matrix4x3.h b/include/matrix4x3.h
@@ -162,7 +162,7 @@ namespace core
 			//! Make a rotation matrix from Euler angles. The 4th row and column are unmodified.
 			inline matrix4x3& setRotationDegrees( const vector3df& rotation )
             {
-                return setRotationRadians( radians<vector3df>(rotation) );
+				return setRotationRadians(vector3df(radians(rotation.X), radians(rotation.Y), radians(rotation.Z)));
             }
 
 			//! Returns the rotation, as set by setRotation().

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`@echo off`
`2`	`2`
`3`	`3`	`set pathtracer="%~dp0/bin/raytracedao.exe"`
	`4`	`+set scenesInput="%~dp0/test_scenes.txt"`
`4`	`5`
`5`	`6`	`pushd bin`
`6`	`7`	`if NOT EXIST %pathtracer% (`
`@@ -10,7 +11,7 @@ if NOT EXIST %pathtracer% (`
`10`	`11`	`)`
`11`	`12`	`popd`
`12`	`13`
`13`		`-for /f "tokens=*" %%s in ('findstr /v /c:";" test_scenes.txt') do (`
	`14`	`+for /f "tokens=*" %%s in ('findstr /v /c:";" %scenesInput%') do (`
`14`	`15`	`REM echo %%s`
`15`	`16`	`Call :render_and_denoise %%s`
`16`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ namespace core`
`162`	`162`	`//! Make a rotation matrix from Euler angles. The 4th row and column are unmodified.`
`163`	`163`	`inline matrix4x3& setRotationDegrees( const vector3df& rotation )`
`164`	`164`	`{`
`165`		`- return setRotationRadians( radians<vector3df>(rotation) );`
	`165`	`+ return setRotationRadians(vector3df(radians(rotation.X), radians(rotation.Y), radians(rotation.Z)));`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`//! Returns the rotation, as set by setRotation().`