Max/korenkonder_ReDIVA
1
0
Fork 0
mirror of https://github.com/korenkonder/ReDIVA.git synced 2026-10-09 15:09:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Formatting fixes

Browse Source
This commit is contained in:
korenkonder
2025-04-04 23:33:45 +03:00
parent 7577d88456
commit f0789f7608
9 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CRE/Glitter/render_scene.cpp
-5
View File
@@ -2236,9 +2236,6 @@ namespace Glitter {
}
mdl::DispManager& disp_manager = *rctx_ptr->disp_manager;
const bool object_culling = disp_manager.object_culling;
if (local)
disp_manager.object_culling = false;
disp_manager.set_texture_pattern(0, 0);
disp_manager.set_obj_flags((mdl::ObjFlags)0);
@@ -2308,7 +2305,5 @@ namespace Glitter {
}
disp_manager.set_texture_transform(0, 0);
rend_group->disp = disp;
if (local)
disp_manager.object_culling = object_culling;
}
}
src/CRE/mdl/disp_manager.cpp
+14 -14
View File
@@ -2615,7 +2615,7 @@ namespace mdl {
::camera* cam = rctx_ptr->camera;
if ( object_culling && !instances_count && !bone_mat && (!obj
if (object_culling && !instances_count && !bone_mat && (!obj
|| !obj_bounding_sphere_check_visibility(
obj->bounding_sphere, &culling, cam, mat))) {
culling.culled.objects++;
@@ -3768,21 +3768,21 @@ static void sub_140436760() {
*(vec3*)&t = aabb->size;
t.w = 1.0f;
float_t view_z = vec4::dot(t ^ vec4( 0.0f, 0.0f, 0.0f, 0.0f ), mat.row2);
if (view_z < vec4::dot(t ^ vec4( 0.0f, 0.0f, -0.0f, 0.0f ), mat.row2))
view_z = vec4::dot(t ^ vec4( 0.0f, 0.0f, -0.0f, 0.0f ), mat.row2);
if (view_z < vec4::dot(t ^ vec4( 0.0f, -0.0f, 0.0f, 0.0f ), mat.row2))
float_t view_z = vec4::dot(t ^ vec4( 0.0f, 0.0f, 0.0f, 0.0f ), mat.row2);
if (view_z < vec4::dot(t ^ vec4( 0.0f, 0.0f, -0.0f, 0.0f ), mat.row2))
view_z = vec4::dot(t ^ vec4( 0.0f, 0.0f, -0.0f, 0.0f ), mat.row2);
if (view_z < vec4::dot(t ^ vec4( 0.0f, -0.0f, 0.0f, 0.0f ), mat.row2))
view_z = -t.y;
if (view_z < vec4::dot(t ^ vec4( 0.0f, -0.0f, -0.0f, 0.0f ), mat.row2))
view_z = vec4::dot(t ^ vec4( 0.0f, -0.0f, -0.0f, 0.0f ), mat.row2);
if (view_z < vec4::dot(t ^ vec4( -0.0f, 0.0f, 0.0f, 0.0f ), mat.row2))
if (view_z < vec4::dot(t ^ vec4( 0.0f, -0.0f, -0.0f, 0.0f ), mat.row2))
view_z = vec4::dot(t ^ vec4( 0.0f, -0.0f, -0.0f, 0.0f ), mat.row2);
if (view_z < vec4::dot(t ^ vec4(-0.0f, 0.0f, 0.0f, 0.0f ), mat.row2))
view_z = -t.x;
if (view_z < vec4::dot(t ^ vec4( -0.0f, 0.0f, -0.0f, 0.0f ), mat.row2))
view_z = vec4::dot(t ^ vec4( -0.0f, 0.0f, -0.0f, 0.0f ), mat.row2);
if (view_z < vec4::dot(t ^ vec4( -0.0f, -0.0f, 0.0f, 0.0f ), mat.row2))
view_z = vec4::dot(t ^ vec4( -0.0f, -0.0f, 0.0f, 0.0f ), mat.row2);
if (view_z < vec4::dot(t ^ vec4( -0.0f, -0.0f, -0.0f, 0.0f ), mat.row2))
view_z = vec4::dot(t ^ vec4( -0.0f, -0.0f, -0.0f, 0.0f ), mat.row2);
if (view_z < vec4::dot(t ^ vec4(-0.0f, 0.0f, -0.0f, 0.0f ), mat.row2))
view_z = vec4::dot(t ^ vec4(-0.0f, 0.0f, -0.0f, 0.0f ), mat.row2);
if (view_z < vec4::dot(t ^ vec4(-0.0f, -0.0f, 0.0f, 0.0f ), mat.row2))
view_z = vec4::dot(t ^ vec4(-0.0f, -0.0f, 0.0f, 0.0f ), mat.row2);
if (view_z < vec4::dot(t ^ vec4(-0.0f, -0.0f, -0.0f, 0.0f ), mat.row2))
view_z = vec4::dot(t ^ vec4(-0.0f, -0.0f, -0.0f, 0.0f ), mat.row2);
i->view_z = view_z;
}
}
src/CRE/rob/rob.cpp
+1 -1
View File
@@ -12632,7 +12632,7 @@ void MotionBlendFreeze::Blend(bone_data* curr, bone_data* prev) {
}
else {
mat4_mul(&curr->rot_mat_prev[1][field_24], &curr->rot_mat_prev[0][field_24], &prev_mat);
mat4_mul( &curr->rot_mat[1], &curr->rot_mat[0], &mat);
mat4_mul(&curr->rot_mat[1], &curr->rot_mat[0], &mat);
mat4_blend_rotation(&prev_mat, &mat, &mat, blend);
}
mat4_transpose(&curr->rot_mat[0], &ik_mat);
src/KKdLib/dds.cpp
+3 -3
View File
@@ -55,9 +55,9 @@ struct DDS_PIXELFORMAT {
#define DDS_SURFACE_FLAGS_MIPMAP 0x00400008 // DDSCAPS_COMPLEX | DDSCAPS_MIPMAP
#define DDS_SURFACE_FLAGS_cube_map 0x00000008 // DDSCAPS_COMPLEX
#define DDS_CUBE_MAP_ALLFACES ( 0x00000400 | 0x00000800 |\
#define DDS_CUBE_MAP_ALLFACES (0x00000400 | 0x00000800 |\
0x00001000 | 0x00002000 |\
0x00004000 | 0x00008000 | 0x00000200 )
0x00004000 | 0x00008000 | 0x00000200)
#define DDS_CUBE_MAP 0x00000200 // DDSCAPS2_cube_map
@@ -285,7 +285,7 @@ void dds::write(const char* path) {
return;
wchar_t* path_buf = utf8_to_utf16(path);
write( path_buf);
write(path_buf);
free_def(path_buf);
}
src/KKdLib/default.hpp
+2 -2
View File
@@ -18,8 +18,8 @@
#include <fileapi.h>
#include <string>
#pragma warning( push )
#pragma warning( disable: 26812 )
#pragma warning(push)
#pragma warning(disable: 26812)
template <typename T>
inline void free_def(T& ptr) {
src/KKdLib/f2/pof.cpp
+1 -1
View File
@@ -186,7 +186,7 @@ static size_t pof_read_offsets_count(stream& s) {
i++;
j++;
}
s.set_position( pos, SEEK_SET);
s.set_position(pos, SEEK_SET);
return j;
}
src/KKdLib/obj.cpp
+1 -1
View File
@@ -3394,7 +3394,7 @@ static obj_skin_block_osage* obj_classic_read_skin_block_osage(
s.position_push(offset, SEEK_SET);
if (!(s.read_uint32_t() & 0x8000))
osg->skin_param = obj_classic_read_skin_param( alloc, s, str);
osg->skin_param = obj_classic_read_skin_param(alloc, s, str);
else {
s.set_position(offset, SEEK_SET);
for (int32_t i = 0; i < osg->num_node; i++) {
src/ReDIVA/data_test/glitter_test.cpp
+1 -1
View File
@@ -205,7 +205,7 @@ void TaskDataTestGlitterParticle::disp() {
}
void TaskDataTestGlitterParticle::SceneFree( ){
void TaskDataTestGlitterParticle::SceneFree() {
Glitter::glt_particle_manager->FreeSceneEffect(scene_counter);
}
src/ReDIVA/system_startup.cpp
+1 -1
View File
@@ -677,7 +677,7 @@ static void system_startup_pv_information_dest() {
}
static void system_startup_pv_information_disp() {
std::string buf( "PV INFORMATION : ");
std::string buf("PV INFORMATION : ");
switch (system_startup->pv_information_state) {
case -2:
buf.append("NG");