MMA is good enough
This commit is contained in:
parent
d4f9ed214f
commit
516fab6ff6
@ -880,20 +880,20 @@ void update_state(state_r0* state, uint32_t dur) {
|
||||
GenericModelOnSceneMem* model = VecGenericModelOnSceneMem_mat(&state->vk.scene.generic_models, 0);
|
||||
assert(model->instance_attr.count >= 1);
|
||||
if (state->first_0x80_keys[XKB_KEY_j]) {
|
||||
state->vk.scene.funny_vector.x -= fl;
|
||||
GenericModelOnSceneMem_set(model, 0, (GenericMeshInstanceInc){.model_t = marie_translation_mat4(state->vk.scene.funny_vector)});
|
||||
state->vk.scene.smeshnyavka_1.buf[0].pos.x -= fl;
|
||||
Scene_update_smeshnyavka_1(&state->vk.scene, 0);
|
||||
}
|
||||
if (state->first_0x80_keys[XKB_KEY_k]) {
|
||||
state->vk.scene.funny_vector.z -= fl;
|
||||
GenericModelOnSceneMem_set(model, 0, (GenericMeshInstanceInc){.model_t = marie_translation_mat4(state->vk.scene.funny_vector)});
|
||||
state->vk.scene.smeshnyavka_1.buf[0].pos.z -= fl;
|
||||
Scene_update_smeshnyavka_1(&state->vk.scene, 0);
|
||||
}
|
||||
if (state->first_0x80_keys[XKB_KEY_l]) {
|
||||
state->vk.scene.funny_vector.z += fl;
|
||||
GenericModelOnSceneMem_set(model, 0, (GenericMeshInstanceInc){.model_t = marie_translation_mat4(state->vk.scene.funny_vector)});
|
||||
state->vk.scene.smeshnyavka_1.buf[0].pos.z += fl;
|
||||
Scene_update_smeshnyavka_1(&state->vk.scene, 0);
|
||||
}
|
||||
if (state->first_0x80_keys[XKB_KEY_semicolon]) {
|
||||
state->vk.scene.funny_vector.x += fl;
|
||||
GenericModelOnSceneMem_set(model, 0, (GenericMeshInstanceInc){.model_t = marie_translation_mat4(state->vk.scene.funny_vector)});
|
||||
state->vk.scene.smeshnyavka_1.buf[0].pos.x += fl;
|
||||
Scene_update_smeshnyavka_1(&state->vk.scene, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -162,7 +162,6 @@ typedef struct {
|
||||
Pipeline0Transfer pipeline0_ubo;
|
||||
|
||||
CamControlInfo cam;
|
||||
vec3 funny_vector;
|
||||
|
||||
VecObjectInfo smeshnyavka_1;
|
||||
VecObjectInfo smeshnyavka_2;
|
||||
@ -227,7 +226,7 @@ Scene Scene_new(VecGenericModelOnSceneMem generic_models, VecShinyModelOnSceneMe
|
||||
return (Scene){.generic_models = generic_models, .shiny_models = shiny_models,
|
||||
.color = {.float32 = {0, 0, 0, 1}},
|
||||
.gamma_correction_factor = 2.2f, .hdr_factor = 1, .lsd_factor = 0, .anim_time = 0,
|
||||
.pipeline0_ubo = pipeline0_ubo, .cam = CamControlInfo_new(), .funny_vector = {0, 0, 0},
|
||||
.pipeline0_ubo = pipeline0_ubo, .cam = CamControlInfo_new(),
|
||||
.smeshnyavka_1 = VecObjectInfo_new(), .smeshnyavka_2 = VecObjectInfo_new(),
|
||||
.smeshnyavka_3 = VecObjectInfo_new(), // todo: remove this shit and rewrite everything in haskell
|
||||
};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user