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

Finished it...

Browse Source
This commit is contained in:
korenkonder
2023-12-05 16:11:27 +03:00
parent 6349f765e2
commit 70c8d7a9f6
78 changed files with 8999 additions and 8531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ReDIVA/glitter_editor.cpp
+19 -19
View File
@@ -2055,12 +2055,12 @@ static void glitter_editor_draw_emitter_type_emitter_inst_f2(
etc.constant = true;
etc.data.cube.size = vec3::max(emit_inst->data.box.size * scale, 0.1f);
etc.data.cube.wire = false;
rctx_ptr->disp_manager.entry_obj_etc(&mat, &etc, local);
rctx_ptr->disp_manager->entry_obj_etc(&mat, &etc, local);
if (glt_edt->draw_flags & GLITTER_EDITOR_DISP_WIREFRAME) {
etc.color = 0xFF000000;
etc.data.cube.wire = true;
rctx_ptr->disp_manager.entry_obj_etc(&mat, &etc, local);
rctx_ptr->disp_manager->entry_obj_etc(&mat, &etc, local);
}
} break;
case Glitter::EMITTER_CYLINDER: {
@@ -2074,12 +2074,12 @@ static void glitter_editor_draw_emitter_type_emitter_inst_f2(
etc.data.cylinder.slices = 16;
etc.data.cylinder.stacks = 1;
etc.data.cylinder.wire = false;
rctx_ptr->disp_manager.entry_obj_etc(&mat, &etc, local);
rctx_ptr->disp_manager->entry_obj_etc(&mat, &etc, local);
if (glt_edt->draw_flags & GLITTER_EDITOR_DISP_WIREFRAME) {
etc.color = 0xFF000000;
etc.data.cylinder.wire = true;
rctx_ptr->disp_manager.entry_obj_etc(&mat, &etc, local);
rctx_ptr->disp_manager->entry_obj_etc(&mat, &etc, local);
}
} break;
case Glitter::EMITTER_SPHERE: {
@@ -2091,12 +2091,12 @@ static void glitter_editor_draw_emitter_type_emitter_inst_f2(
etc.data.sphere.slices = 16;
etc.data.sphere.stacks = 16;
etc.data.sphere.wire = false;
rctx_ptr->disp_manager.entry_obj_etc(&mat, &etc, local);
rctx_ptr->disp_manager->entry_obj_etc(&mat, &etc, local);
if (glt_edt->draw_flags & GLITTER_EDITOR_DISP_WIREFRAME) {
etc.color = 0xFF000000;
etc.data.sphere.wire = true;
rctx_ptr->disp_manager.entry_obj_etc(&mat, &etc, local);
rctx_ptr->disp_manager->entry_obj_etc(&mat, &etc, local);
}
} break;
case Glitter::EMITTER_POLYGON: {
@@ -2106,11 +2106,11 @@ static void glitter_editor_draw_emitter_type_emitter_inst_f2(
etc.constant = true;
etc.data.line.pos[0] = vec3(-emit_inst->data.polygon.size * scale.x * 0.5f, 0.0f, 0.0f);
etc.data.line.pos[1] = vec3(emit_inst->data.polygon.size * scale.x * 0.5f, 0.0f, 0.0f);
rctx_ptr->disp_manager.entry_obj_etc(&mat, &etc, local);
rctx_ptr->disp_manager->entry_obj_etc(&mat, &etc, local);
if (glt_edt->draw_flags & GLITTER_EDITOR_DISP_WIREFRAME) {
etc.color = 0xFF000000;
rctx_ptr->disp_manager.entry_obj_etc(&mat, &etc, local);
rctx_ptr->disp_manager->entry_obj_etc(&mat, &etc, local);
}
} break;
}
@@ -2151,12 +2151,12 @@ static void glitter_editor_draw_emitter_type_emitter_inst_x(
etc.constant = true;
etc.data.cube.size = vec3::max(emit_inst->data.box.size * scale, 0.1f);
etc.data.cube.wire = false;
rctx_ptr->disp_manager.entry_obj_etc(&mat, &etc, local);
rctx_ptr->disp_manager->entry_obj_etc(&mat, &etc, local);
if (glt_edt->draw_flags & GLITTER_EDITOR_DISP_WIREFRAME) {
etc.color = 0xFF000000;
etc.data.cube.wire = true;
rctx_ptr->disp_manager.entry_obj_etc(&mat, &etc, local);
rctx_ptr->disp_manager->entry_obj_etc(&mat, &etc, local);
}
} break;
case Glitter::EMITTER_CYLINDER: {
@@ -2170,12 +2170,12 @@ static void glitter_editor_draw_emitter_type_emitter_inst_x(
etc.data.cylinder.slices = 16;
etc.data.cylinder.stacks = 1;
etc.data.cylinder.wire = false;
rctx_ptr->disp_manager.entry_obj_etc(&mat, &etc, local);
rctx_ptr->disp_manager->entry_obj_etc(&mat, &etc, local);
if (glt_edt->draw_flags & GLITTER_EDITOR_DISP_WIREFRAME) {
etc.color = 0xFF000000;
etc.data.cylinder.wire = true;
rctx_ptr->disp_manager.entry_obj_etc(&mat, &etc, local);
rctx_ptr->disp_manager->entry_obj_etc(&mat, &etc, local);
}
} break;
case Glitter::EMITTER_SPHERE: {
@@ -2187,12 +2187,12 @@ static void glitter_editor_draw_emitter_type_emitter_inst_x(
etc.data.sphere.slices = 16;
etc.data.sphere.stacks = 16;
etc.data.sphere.wire = false;
rctx_ptr->disp_manager.entry_obj_etc(&mat, &etc, local);
rctx_ptr->disp_manager->entry_obj_etc(&mat, &etc, local);
if (glt_edt->draw_flags & GLITTER_EDITOR_DISP_WIREFRAME) {
etc.color = 0xFF000000;
etc.data.sphere.wire = true;
rctx_ptr->disp_manager.entry_obj_etc(&mat, &etc, local);
rctx_ptr->disp_manager->entry_obj_etc(&mat, &etc, local);
}
} break;
case Glitter::EMITTER_POLYGON: {
@@ -2206,12 +2206,12 @@ static void glitter_editor_draw_emitter_type_emitter_inst_x(
etc.data.cylinder.slices = 16;
etc.data.cylinder.stacks = 0;
etc.data.cylinder.wire = false;
rctx_ptr->disp_manager.entry_obj_etc(&mat, &etc, local);
rctx_ptr->disp_manager->entry_obj_etc(&mat, &etc, local);
if (glt_edt->draw_flags & GLITTER_EDITOR_DISP_WIREFRAME) {
etc.color = 0xFF000000;
etc.data.cylinder.wire = true;
rctx_ptr->disp_manager.entry_obj_etc(&mat, &etc, local);
rctx_ptr->disp_manager->entry_obj_etc(&mat, &etc, local);
}
} break;
}
@@ -2307,7 +2307,7 @@ static void glitter_editor_disp_wireframe_render_scene(GlitterEditor* glt_edt,
|| rend_group->blend_mode == Glitter::PARTICLE_BLEND_TYPICAL)
emission = rend_group->emission;
Glitter::BatchShaderData shader_data = {};
glitter_batch_shader_data shader_data = {};
mat4_transpose(&mat, &mat);
shader_data.g_mvp[0] = mat.row0;
shader_data.g_mvp[1] = mat.row1;
@@ -2316,10 +2316,10 @@ static void glitter_editor_disp_wireframe_render_scene(GlitterEditor* glt_edt,
shader_data.g_glitter_blend_color = 1.0f;
shader_data.g_state_material_diffuse = 0.0f;
shader_data.g_state_material_emission = { emission, emission, emission, 1.0f };
GPM_VAL->batch_ubo.WriteMemory(shader_data);
rctx_ptr->glitter_batch_ubo.WriteMemory(shader_data);
shaders_dev.set(SHADER_DEV_GLITTER_PT_WIREFRAME);
GPM_VAL->batch_ubo.Bind(2);
rctx_ptr->glitter_batch_ubo.Bind(2);
switch (rend_group->type) {
case Glitter::PARTICLE_QUAD:
gl_state_bind_vertex_array(rend_group->vao);