BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2026-01-05 01:51:02 +07:00
Code Issues Packages Projects Releases Wiki Activity

material and geometry ptr for draw_command

Browse Source
This commit is contained in:
Matvey Cherevko
2018-10-25 23:47:38 +07:00
parent 9225af63ae
commit 0cf3b932d6
8 changed files with 92 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/sources/sample_00/sample_00.cpp
View File

@@ -144,7 +144,7 @@ int e2d_main() {
return 1;
}
auto material = render::material()
auto material = render::material::create(render::material()
.add_pass(render::pass_state()
.states(render::state_block()
.capabilities(render::capabilities_state()
@@ -161,12 +161,12 @@ int e2d_main() {
.sampler("u_texture2", render::sampler_state()
.texture(texture2)
.min_filter(render::sampler_min_filter::linear)
.mag_filter(render::sampler_mag_filter::linear))));
.mag_filter(render::sampler_mag_filter::linear)))));
auto geometry = render::geometry()
auto geometry = render::geometry::create(render::geometry()
.indices(index_buffer)
.add_vertices(vertex_buffer1)
.add_vertices(vertex_buffer2);
.add_vertices(vertex_buffer2));
const auto begin_game_time = time::now_ms();
const auto framebuffer_size = the<window>().real_size().cast_to<f32>();
@@ -176,7 +176,7 @@ int e2d_main() {
while ( !the<window>().should_close() && !k.is_key_just_released(keyboard_key::escape) ) {
const auto game_time = (time::now_ms() - begin_game_time).cast_to<f32>().value;
material.properties()
material->properties()
.property("u_time", game_time)
.property("u_MVP", projection);

10
samples/sources/sample_01/sample_01.cpp
View File

@@ -202,7 +202,7 @@ int e2d_main() {
return 1;
}
auto material = render::material()
auto material = render::material::create(render::material()
.add_pass(render::pass_state()
.states(render::state_block()
.capabilities(render::capabilities_state()
@@ -216,12 +216,12 @@ int e2d_main() {
.sampler("u_texture", render::sampler_state()
.texture(texture)
.min_filter(render::sampler_min_filter::linear)
.mag_filter(render::sampler_mag_filter::linear))));
.mag_filter(render::sampler_mag_filter::linear)))));
auto geometry = render::geometry()
auto geometry = render::geometry::create(render::geometry()
.indices(index_buffer)
.add_vertices(vertex_buffer1)
.add_vertices(vertex_buffer2);
.add_vertices(vertex_buffer2));
const auto begin_game_time = time::now_ms();
const auto framebuffer_size = the<window>().real_size().cast_to<f32>();
@@ -243,7 +243,7 @@ int e2d_main() {
math::make_loot_at_lh_matrix4({0.f,0.f,-3.f}, v3f::zero(), v3f::unit_y()) *
projection;
material.properties()
material->properties()
.property("u_time", game_time)
.property("u_MVP", MVP);

10
samples/sources/sample_02/sample_02.cpp
View File

@@ -151,7 +151,7 @@ int e2d_main() {
return 1;
}
auto material = render::material()
auto material = render::material::create(render::material()
.add_pass(render::pass_state()
.states(render::state_block()
.capabilities(render::capabilities_state()
@@ -169,11 +169,11 @@ int e2d_main() {
.sampler("u_texture", render::sampler_state()
.texture(texture)
.min_filter(render::sampler_min_filter::linear)
.mag_filter(render::sampler_mag_filter::linear)));
.mag_filter(render::sampler_mag_filter::linear))));
auto geometry = render::geometry()
auto geometry = render::geometry::create(render::geometry()
.indices(index_buffer)
.add_vertices(vertex_buffer);
.add_vertices(vertex_buffer));
const auto begin_game_time = time::now_ms();
const auto framebuffer_size = the<window>().real_size().cast_to<f32>();
@@ -201,7 +201,7 @@ int e2d_main() {
math::make_loot_at_lh_matrix4({0.f,0.f,-2.f}, v3f::zero(), v3f::unit_y()) *
projection;
material.properties()
material->properties()
.property("u_time", game_time)
.property("u_MVP", MVP);