Skip to content

Commit 2127e88

Browse files
patriciogonzalezvivopatriciogonzalezvivo
committed
latest vera
1 parent 4563086 commit 2127e88

File tree

5 files changed

+51
-46
lines changed

5 files changed

+51
-46
lines changed

‎deps/vera‎

Submodule vera updated 64 files

‎examples/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ test_audio_amp:
4444
glslViewer test_audio_amp.frag -l --audio
4545

4646
test_video:
47-
glslViewer test_video.frag in.mp4 -w 960 -h 540
47+
glslViewer test_video.frag video.mp4 -w 960 -h 540
4848

4949
test_video_prevs:
50-
glslViewer test_video.frag in.mp4 -w 960 -h 540 -e streams,prevs,10 -e streams,speed,0.5
50+
glslViewer test_video.frag video.mp4 -w 960 -h 540 -e streams,prevs,10 -e streams,speed,0.5
5151

5252
test_buffers:
5353
glslViewer test_buffers.frag -l

‎src/core/glslViewer.cpp‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ GlslViewer::GlslViewer():
7171
m_showTextures(false), m_showPasses(false)
7272
{
7373
// set vera scene values to uniforms
74-
vera::setScene( (vera::Scene*)&uniforms );
74+
vera::scene( (vera::Scene*)&uniforms );
7575

7676
// TIME UNIFORMS
7777
//
@@ -125,6 +125,10 @@ GlslViewer::GlslViewer():
125125
[]() { return vera::toString(vera::getMouseX(),1) + "," + vera::toString(vera::getMouseYFlipped(),1); } );
126126

127127
// VIEWPORT
128+
uniforms.functions["u_pixelDensity"] = UniformFunction("float", [](vera::Shader& _shader) {
129+
_shader.setUniform("u_pixelDensity", vera::pixelDensity());
130+
},
131+
[]() { return vera::toString(vera::getViewport().x,1) + "," + vera::toString(vera::getViewport().y,1) + "," + vera::toString(vera::getViewport().z,1) + "," + vera::toString(vera::getViewport().w,1); });
128132
uniforms.functions["u_resolution"]= UniformFunction("vec2", [](vera::Shader& _shader) {
129133
_shader.setUniform("u_resolution", float(vera::getWindowWidth()), float(vera::getWindowHeight()));
130134
},
@@ -1473,7 +1477,7 @@ void GlslViewer::_updateBuffers() {
14731477
m_pyramid_shader.setUniform("u_resolution", ((float)_target->getWidth()), ((float)_target->getHeight()));
14741478
m_pyramid_shader.setUniform("u_pixel", 1.0f/((float)_target->getWidth()), 1.0f/((float)_target->getHeight()));
14751479

1476-
vera::getBillboard()->render( &m_pyramid_shader );
1480+
vera::billboard()->render( &m_pyramid_shader );
14771481
_target->unbind();
14781482
};
14791483

@@ -1540,7 +1544,7 @@ void GlslViewer::_updateBuffers() {
15401544
m_flood_shader.textureIndex = (uniforms.models.size() == 0) ? 1 : 0;
15411545
m_flood_shader.setUniformTexture("u_floodSrc", _src);
15421546

1543-
vera::getBillboard()->render( &m_flood_shader );
1547+
vera::billboard()->render( &m_flood_shader );
15441548
_dst->unbind();
15451549
};
15461550
}
@@ -1608,7 +1612,7 @@ void GlslViewer::_renderBuffers() {
16081612
// Update uniforms and textures
16091613
uniforms.feedTo( &m_buffers_shaders[i], true, false);
16101614

1611-
vera::getBillboard()->render( &m_buffers_shaders[i] );
1615+
vera::billboard()->render( &m_buffers_shaders[i] );
16121616

16131617
uniforms.buffers[i]->unbind();
16141618

@@ -1640,7 +1644,7 @@ void GlslViewer::_renderBuffers() {
16401644
// Update uniforms and textures
16411645
uniforms.feedTo( &m_doubleBuffers_shaders[i], true, false);
16421646

1643-
vera::getBillboard()->render( &m_doubleBuffers_shaders[i] );
1647+
vera::billboard()->render( &m_doubleBuffers_shaders[i] );
16441648

16451649
uniforms.doubleBuffers[i]->dst->unbind();
16461650
uniforms.doubleBuffers[i]->swap();
@@ -1667,7 +1671,7 @@ void GlslViewer::_renderBuffers() {
16671671
if (m_sceneRender.buffersFbo[j]->isAllocated())
16681672
m_pyramid_subshaders[i].setUniformTexture("u_sceneBuffer" + vera::toString(j), m_sceneRender.buffersFbo[j] );
16691673

1670-
vera::getBillboard()->render( &m_pyramid_subshaders[i] );
1674+
vera::billboard()->render( &m_pyramid_subshaders[i] );
16711675

16721676
m_pyramid_fbos[i].unbind();
16731677

@@ -1705,7 +1709,7 @@ void GlslViewer::_renderBuffers() {
17051709
// Update uniforms and textures
17061710
uniforms.feedTo( &m_flood_subshaders[i], true, false );
17071711

1708-
vera::getBillboard()->render( &m_flood_subshaders[i] );
1712+
vera::billboard()->render( &m_flood_subshaders[i] );
17091713

17101714
uniforms.floods[i].dst->unbind();
17111715

@@ -1819,7 +1823,7 @@ void GlslViewer::render() {
18191823
m_canvas_shader.setUniform("u_viewMatrix", glm::mat4(1.0f));
18201824
m_canvas_shader.setUniform("u_projectionMatrix", glm::mat4(1.0f));
18211825
m_canvas_shader.setUniform("u_modelViewProjectionMatrix", glm::mat4(1.));
1822-
vera::getBillboard()->render( &m_canvas_shader );
1826+
vera::billboard()->render( &m_canvas_shader );
18231827
}, quilt_tile, true);
18241828
}
18251829

@@ -1833,7 +1837,7 @@ void GlslViewer::render() {
18331837
m_canvas_shader.setUniform("u_viewMatrix", glm::mat4(1.0f));
18341838
m_canvas_shader.setUniform("u_projectionMatrix", glm::mat4(1.0f));
18351839
m_canvas_shader.setUniform("u_modelViewProjectionMatrix", glm::mat4(1.));
1836-
vera::getBillboard()->render( &m_canvas_shader );
1840+
vera::billboard()->render( &m_canvas_shader );
18371841
}
18381842

18391843
TRACK_END("render:2D_scene")
@@ -1899,7 +1903,7 @@ void GlslViewer::renderPost() {
18991903
if (lenticular.size() > 0)
19001904
feedLenticularUniforms(m_postprocessing_shader);
19011905

1902-
vera::getBillboard()->render( &m_postprocessing_shader );
1906+
vera::billboard()->render( &m_postprocessing_shader );
19031907

19041908
TRACK_END("render:postprocessing")
19051909
}
@@ -1959,7 +1963,7 @@ void GlslViewer::renderUI() {
19591963
vera::textAngle(0.0);
19601964
vera::textAlign(vera::ALIGN_TOP);
19611965
vera::textAlign(vera::ALIGN_LEFT);
1962-
vera::textSize(xStep * 0.2f / vera::getPixelDensity(false));
1966+
vera::textSize(xStep * 0.2f / vera::pixelDensity());
19631967

19641968
for (vera::TexturesMap::iterator it = uniforms.textures.begin(); it != uniforms.textures.end(); it++) {
19651969
float imgAspect = ((float)it->second->getWidth()/(float)it->second->getHeight());
@@ -2007,7 +2011,7 @@ void GlslViewer::renderUI() {
20072011
float yOffset = h - yStep;
20082012

20092013
vera::textAngle(0.0);
2010-
vera::textSize(xStep * 0.2f / vera::getPixelDensity(false));
2014+
vera::textSize(xStep * 0.2f / vera::pixelDensity());
20112015
vera::textAlign(vera::ALIGN_TOP);
20122016
vera::textAlign(vera::ALIGN_LEFT);
20132017

@@ -2131,7 +2135,7 @@ void GlslViewer::renderUI() {
21312135
vera::setDepthTest(false);
21322136
TRACK_BEGIN("renderUI:plot_data")
21332137

2134-
float p = vera::getPixelDensity();
2138+
float p = vera::pixelDensity();
21352139
float w = 100 * p;
21362140
float h = 30 * p;
21372141
float x = (float)(vera::getWindowWidth()) * 0.5;
@@ -2149,7 +2153,7 @@ void GlslViewer::renderUI() {
21492153
m_plot_shader.setUniform("u_modelViewProjectionMatrix", vera::getOrthoMatrix());
21502154
m_plot_shader.setUniformTexture("u_plotData", m_plot_texture, 0);
21512155

2152-
vera::getBillboard()->render(&m_plot_shader);
2156+
vera::billboard()->render(&m_plot_shader);
21532157
TRACK_END("renderUI:plot_data")
21542158
}
21552159

@@ -2158,7 +2162,7 @@ void GlslViewer::renderUI() {
21582162
if (m_cross_vbo == nullptr)
21592163
m_cross_vbo = std::unique_ptr<vera::Vbo>(new vera::Vbo( vera::crossMesh( glm::vec3(0.0f, 0.0f, 0.0f), 10.0f) ));
21602164

2161-
vera::Shader* fill = vera::getFillShader();
2165+
vera::Shader* fill = vera::fillShader();
21622166
fill->use();
21632167
fill->setUniform("u_modelViewProjectionMatrix", glm::translate(vera::getOrthoMatrix(), glm::vec3(vera::getMousePositionFlipped(), 0.0f) ) );
21642168
fill->setUniform("u_color", glm::vec4(1.0f));
@@ -2174,7 +2178,7 @@ void GlslViewer::renderUI() {
21742178
float x = xStep * 2.0f;
21752179
float y = yStep * 3.0f;
21762180

2177-
vera::Camera *cam = vera::getCamera();
2181+
vera::Camera *cam = vera::camera();
21782182
vera::resetCamera();
21792183

21802184
vera::fill(0.0f, 0.0f, 0.0f, 0.75f);
@@ -2204,7 +2208,7 @@ void GlslViewer::renderUI() {
22042208
float x = xStep * 2.0f;
22052209
float y = yStep * 3.0f;
22062210

2207-
vera::Camera *cam = vera::getCamera();
2211+
vera::Camera *cam = vera::camera();
22082212
vera::resetCamera();
22092213

22102214
vera::fill(0.0f, 0.0f, 0.0f, 0.75f);
@@ -2216,7 +2220,7 @@ void GlslViewer::renderUI() {
22162220
vera::textAlign(vera::ALIGN_LEFT);
22172221
vera::textAngle(0.0f);
22182222
vera::textSize(22.0f);
2219-
yStep = vera::getFontHeight() * 1.5f;
2223+
yStep = vera::textHeight() * 1.5f;
22202224

22212225
if (geom_index != -1) {
22222226
vera::text("a - " + std::string( m_sceneRender.showAxis? "hide" : "show" ) + " axis", x, y);
@@ -2412,7 +2416,7 @@ void GlslViewer::onMouseDrag(float _x, float _y, int _button) {
24122416
//
24132417
float x = _x;
24142418
float y = _y;
2415-
float pd = vera::getPixelDensity();
2419+
float pd = vera::getDisplayPixelRatio();
24162420

24172421
if (x <= 0) x = vera::getWindowWidth() - 2;
24182422
else if (x >= vera::getWindowWidth()) x = 2;

‎src/core/sceneRender.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ void SceneRender::render(Uniforms& _uniforms) {
631631
_uniforms.feedTo( it->second->getShader(), true, true );
632632

633633
// Pass special uniforms
634-
it->second->getShader()->setUniform( "u_modelViewProjectionMatrix", vera::getProjectionViewWorldMatrix() * it->second->getTransformMatrix() );
634+
it->second->getShader()->setUniform( "u_modelViewProjectionMatrix", vera::projectionViewWorldMatrix() * it->second->getTransformMatrix() );
635635
it->second->getShader()->setUniform( "u_modelMatrix", m_origin.getTransformMatrix() * it->second->getTransformMatrix() );
636636
it->second->getShader()->setUniform( "u_model", m_origin.getPosition() + m_floor.getPosition() );
637637

@@ -679,7 +679,7 @@ void SceneRender::renderNormalBuffer(Uniforms& _uniforms) {
679679
TRACK_BEGIN("render:sceneNormal:floor")
680680
normalShader->use();
681681
_uniforms.feedTo( normalShader, false );
682-
normalShader->setUniform("u_modelViewProjectionMatrix", vera::getProjectionViewWorldMatrix() * m_floor.getTransformMatrix());
682+
normalShader->setUniform("u_modelViewProjectionMatrix", vera::projectionViewWorldMatrix() * m_floor.getTransformMatrix());
683683
normalShader->setUniform("u_model", m_origin.getPosition() + m_floor.getPosition() );
684684
normalShader->setUniform("u_modelMatrix", m_origin.getTransformMatrix() * m_floor.getTransformMatrix() );
685685
m_floor.render(normalShader);
@@ -701,7 +701,7 @@ void SceneRender::renderNormalBuffer(Uniforms& _uniforms) {
701701
_uniforms.feedTo( normalShader, false );
702702

703703
// Pass special uniforms
704-
normalShader->setUniform( "u_modelViewProjectionMatrix", vera::getProjectionViewWorldMatrix() * it->second->getTransformMatrix());
704+
normalShader->setUniform( "u_modelViewProjectionMatrix", vera::projectionViewWorldMatrix() * it->second->getTransformMatrix());
705705
normalShader->setUniform( "u_model", m_origin.getPosition() + it->second->getPosition() );
706706
normalShader->setUniform( "u_modelMatrix", m_origin.getTransformMatrix() * it->second->getTransformMatrix() );
707707
it->second->render(normalShader);
@@ -741,7 +741,7 @@ void SceneRender::renderPositionBuffer(Uniforms& _uniforms) {
741741
TRACK_BEGIN("render:scenePosition:floor")
742742
positionShader->use();
743743
_uniforms.feedTo( positionShader, false );
744-
positionShader->setUniform("u_modelViewProjectionMatrix", vera::getProjectionViewWorldMatrix() * m_floor.getTransformMatrix() );
744+
positionShader->setUniform("u_modelViewProjectionMatrix", vera::projectionViewWorldMatrix() * m_floor.getTransformMatrix() );
745745
positionShader->setUniform("u_model", m_origin.getPosition() + m_floor.getPosition() );
746746
positionShader->setUniform("u_modelMatrix", m_origin.getTransformMatrix() * m_floor.getTransformMatrix() );
747747
m_floor.render(positionShader);
@@ -763,7 +763,7 @@ void SceneRender::renderPositionBuffer(Uniforms& _uniforms) {
763763
_uniforms.feedTo( positionShader, false );
764764

765765
// Pass special uniforms
766-
positionShader->setUniform( "u_modelViewProjectionMatrix", vera::getProjectionViewWorldMatrix() * it->second->getTransformMatrix() );
766+
positionShader->setUniform( "u_modelViewProjectionMatrix", vera::projectionViewWorldMatrix() * it->second->getTransformMatrix() );
767767
positionShader->setUniform( "u_model", m_origin.getPosition() + it->second->getPosition() );
768768
positionShader->setUniform( "u_modelMatrix", m_origin.getTransformMatrix() * it->second->getTransformMatrix() );
769769
it->second->render(positionShader);
@@ -820,7 +820,7 @@ void SceneRender::renderBuffers(Uniforms& _uniforms) {
820820
TRACK_BEGIN("render:"+bufferName+":floor")
821821
bufferShader->use();
822822
_uniforms.feedTo( bufferShader, false );
823-
bufferShader->setUniform( "u_modelViewProjectionMatrix", vera::getProjectionViewWorldMatrix() * m_floor.getTransformMatrix() );
823+
bufferShader->setUniform( "u_modelViewProjectionMatrix", vera::projectionViewWorldMatrix() * m_floor.getTransformMatrix() );
824824
bufferShader->setUniform( "u_model", m_origin.getPosition() + m_floor.getPosition() );
825825
bufferShader->setUniform( "u_modelMatrix", m_origin.getTransformMatrix() * m_floor.getTransformMatrix() );
826826
m_floor.render(bufferShader);
@@ -843,7 +843,7 @@ void SceneRender::renderBuffers(Uniforms& _uniforms) {
843843
_uniforms.feedTo( bufferShader, false );
844844

845845
// Pass special uniforms
846-
bufferShader->setUniform( "u_modelViewProjectionMatrix", vera::getProjectionViewWorldMatrix() * it->second->getTransformMatrix() );
846+
bufferShader->setUniform( "u_modelViewProjectionMatrix", vera::projectionViewWorldMatrix() * it->second->getTransformMatrix() );
847847
bufferShader->setUniform( "u_model", m_origin.getPosition() + it->second->getPosition() );
848848
bufferShader->setUniform( "u_modelMatrix", m_origin.getTransformMatrix() * it->second->getTransformMatrix() );
849849
it->second->render(bufferShader);
@@ -934,7 +934,7 @@ void SceneRender::renderBackground(Uniforms& _uniforms) {
934934
// Update Uniforms and textures
935935
_uniforms.feedTo( &m_background_shader );
936936

937-
vera::getBillboard()->render( &m_background_shader );
937+
vera::billboard()->render( &m_background_shader );
938938

939939
TRACK_END("render:scene:background")
940940
}
@@ -984,7 +984,7 @@ void SceneRender::renderFloor(Uniforms& _uniforms) {
984984

985985
_uniforms.feedTo( m_floor.getShader(), true, true );
986986

987-
m_floor.getShader()->setUniform("u_modelViewProjectionMatrix", vera::getProjectionViewWorldMatrix() * m_floor.getTransformMatrix() );
987+
m_floor.getShader()->setUniform("u_modelViewProjectionMatrix", vera::projectionViewWorldMatrix() * m_floor.getTransformMatrix() );
988988
m_floor.getShader()->setUniform("u_modelMatrix", m_origin.getTransformMatrix() * m_floor.getTransformMatrix() );
989989
m_floor.getShader()->setUniform("u_model", m_origin.getPosition() + m_floor.getPosition() );
990990

@@ -1021,7 +1021,7 @@ void SceneRender::renderDebug(Uniforms& _uniforms) {
10211021
vera::setDepthTest(true);
10221022
vera::blendMode(vera::BLEND_ALPHA);
10231023

1024-
vera::Shader* fill = vera::getFillShader();
1024+
vera::Shader* fill = vera::fillShader();
10251025

10261026
// Draw Bounding boxes
10271027
if (showBBoxes) {
@@ -1068,7 +1068,7 @@ void SceneRender::renderDebug(Uniforms& _uniforms) {
10681068
m_lightUI_shader.use();
10691069
m_lightUI_shader.setUniform("u_scale", 2.0f, 2.0f);
10701070
m_lightUI_shader.setUniform("u_viewMatrix", _uniforms.activeCamera->getViewMatrix());
1071-
m_lightUI_shader.setUniform("u_modelViewProjectionMatrix", vera::getProjectionViewWorldMatrix() );
1071+
m_lightUI_shader.setUniform("u_modelViewProjectionMatrix", vera::projectionViewWorldMatrix() );
10721072

10731073
for (vera::LightsMap::iterator it = _uniforms.lights.begin(); it != _uniforms.lights.end(); ++it) {
10741074
m_lightUI_shader.setUniform("u_translate", it->second->getPosition());

‎src/main.cpp‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,7 @@ void commandsInit() {
12391239

12401240
commands.push_back(Command("screen_size", [&](const std::string& _line){
12411241
if (_line == "screen_size") {
1242-
std::cout << vera::getScreenWidth() << ',' << vera::getScreenHeight()<< std::endl;
1242+
std::cout << vera::getDisplayWidth() << ',' << vera::getDisplayHeight()<< std::endl;
12431243
return true;
12441244
}
12451245
return false;
@@ -1528,7 +1528,7 @@ void commandsInit() {
15281528
settings.src_width = vera::getWindowWidth();
15291529
settings.src_height = vera::getWindowHeight();
15301530
settings.src_fps = vera::getFps();
1531-
float pd = vera::getPixelDensity();
1531+
float pd = vera::getDisplayPixelRatio();
15321532

15331533
settings.trg_path = values[1];
15341534
float from = 0;
@@ -1677,21 +1677,22 @@ void commandsInit() {
16771677

16781678
commands.push_back(Command("pixel_density", [&](const std::string& _line){
16791679
if (_line == "pixel_density") {
1680-
std::cout << vera::getPixelDensity() << std::endl;
1680+
std::cout << vera::getDisplayPixelRatio() << std::endl;
16811681
return true;
16821682
}
1683-
else {
1684-
std::vector<std::string> values = vera::split(_line,',');
1685-
if (values.size() == 2) {
1686-
commandsMutex.lock();
1687-
vera::setPixelDensity( vera::toFloat(values[1]) );
1688-
commandsMutex.unlock();
1689-
return true;
1690-
}
1691-
}
1683+
// else {
1684+
// std::vector<std::string> values = vera::split(_line,',');
1685+
// if (values.size() == 2) {
1686+
// commandsMutex.lock();
1687+
// vera::setPixelDensity( vera::toFloat(values[1]) );
1688+
// commandsMutex.unlock();
1689+
// return true;
1690+
// }
1691+
// }
16921692
return false;
16931693
},
1694-
"pixel_density[,<pixel_density>]", "return or set pixel density", false));
1694+
// "pixel_density[,<pixel_density>]", "return or set pixel density", false));
1695+
"pixel_density", "return pixel density", false));
16951696

16961697
// SET only commands
16971698
//

0 commit comments

Comments
 (0)