From f598bb15418484acfbbe76c6819445463c45664d Mon Sep 17 00:00:00 2001 From: ink-soul Date: Sun, 28 Apr 2024 15:28:46 +0800 Subject: [PATCH] complete --- base/camera.hpp | 2 +- base/renderConfig.cpp | 31 ++++++++++++++++----- base/renderConfig.h | 5 ++-- data/config/yukino_rotate_trans_matrix.toml | 5 ++-- src/render/render.cpp | 8 +++--- 5 files changed, 35 insertions(+), 16 deletions(-) diff --git a/base/camera.hpp b/base/camera.hpp index b5f5860..ce27d66 100644 --- a/base/camera.hpp +++ b/base/camera.hpp @@ -46,7 +46,7 @@ private: this->forward = glm::normalize(lookAtPoint - position); //matrices.view = getLookAtViewMatrix(); - //matrices.view = transM * rotM ; + //matrices.view = transM * glm::transpose(rotM) ; // matrices.view = transM * glm::transpose(rotationMatrix);//LookAt(position, to, up, false, true);//transM * glm::transpose(glm::inverse(rotationMatrix)); matrices.view = LookAt(position, lookAtPoint, up, true, true); } diff --git a/base/renderConfig.cpp b/base/renderConfig.cpp index 6ef3af4..3d12e06 100644 --- a/base/renderConfig.cpp +++ b/base/renderConfig.cpp @@ -4,8 +4,12 @@ void PlumageConfig::PlumageConfiguration::readConfigurationFromToml(std::string configFilePath,Settings& settings) { + /* + parse config file + */ auto config = toml::parse(configFilePath); - + + // get settings auto& tomlSettings = toml::find(config, "settings"); settings.width = toml::find(tomlSettings, "width"); @@ -17,6 +21,11 @@ void PlumageConfig::PlumageConfiguration::readConfigurationFromToml(std::string settings.startFrameIndex = toml::find(tomlSettings, "startFrameIndex"); settings.endFrameIndex = toml::find(tomlSettings, "endFrameIndex"); settings.videoFrameRate = toml::find(tomlSettings, "videoFrameRate"); + + /* + get settings.camera + */ + auto& camera = toml::find(tomlSettings, "camera"); settings.calibrationWidth = toml::find(camera, "cam_width"); settings.calibrationHeight = toml::find(camera, "cam_height"); @@ -24,12 +33,17 @@ void PlumageConfig::PlumageConfiguration::readConfigurationFromToml(std::string std::string fY = toml::find(camera, "fy"); std::string cX = toml::find(camera, "cX"); std::string cY = toml::find(camera, "cY"); + std::vector pedestledModelTopCenter = toml::find>(camera, "pedestledModelTopCenter"); std::vector bottomCenter = toml::find>(camera, "bottomCenter"); std::vector bottomNormal = toml::find>(camera, "bottomNormal"); std::vector cameraFixation = toml::find>(camera, "center"); std::vector> cameraTracks = toml::find>>(camera, "cameraTracks"); std::vector>> cameraAngle = toml::find>>>(camera, "cameraAngle"); + /* + get settings.debug + */ + auto& debug = toml::find(tomlSettings, "debug"); settings.validation = toml::find(debug, "validation"); settings.vsync = toml::find(debug, "vsync"); @@ -38,6 +52,8 @@ void PlumageConfig::PlumageConfiguration::readConfigurationFromToml(std::string settings.debugMode = toml::find(debug, "debugMode"); //settings.cleanUpImageSequece = toml::find_or(debug, "cleanUpImageSequece"); + // + /* conversion: type and coordinate system */ @@ -47,16 +63,17 @@ void PlumageConfig::PlumageConfiguration::readConfigurationFromToml(std::string settings.fY = std::stof(fY, &sz); settings.cX = std::stof(cX, &sz); settings.cY = std::stof(cY, &sz); - settings.bottomCenter = glm::vec3(bottomCenter[0], -bottomCenter[1], -bottomCenter[2]); - settings.bottomNormal = glm::vec3(bottomNormal[0], -bottomNormal[1], -bottomNormal[2]); - settings.cameraFixation = glm::vec3(cameraFixation[0], -cameraFixation[1], -cameraFixation[2]); + settings.bottomCenter = glm::vec3(bottomCenter[0], -bottomCenter[1], bottomCenter[2]); + settings.bottomNormal = glm::vec3(bottomNormal[0], -bottomNormal[1], bottomNormal[2]); + settings.cameraFixation = glm::vec3(cameraFixation[0], -cameraFixation[1], cameraFixation[2]); + std::vector cameraTrackToFixation; auto cameraTracksAndAngleSize = std::min(cameraTracks.size(), cameraAngle.size()); settings.cameraTracks.resize(cameraTracksAndAngleSize); settings.cameraAngle.resize(cameraTracksAndAngleSize); - + cameraTrackToFixation.resize(cameraTracksAndAngleSize); for (uint64_t i = 0; i < cameraTracksAndAngleSize; i++) { - settings.cameraTracks[i] = glm::vec3(cameraTracks[i][0], cameraTracks[i][1] , -cameraTracks[i][2]); + settings.cameraTracks[i] = glm::vec3(cameraTracks[i][0], -cameraTracks[i][1] , cameraTracks[i][2]); cameraTrackToFixation[i] = settings.cameraTracks[i] - settings.bottomCenter; settings.cameraAngle[i] = glm::mat3(glm::vec3(cameraAngle[i][0][0], cameraAngle[i][0][1], -cameraAngle[i][0][2]), @@ -86,7 +103,7 @@ void PlumageConfig::PlumageConfiguration::readConfigurationFromToml(std::string { cameraTrackToFixation[i] = cameraTracksRotationMatrix * glm::vec4(cameraTrackToFixation[i], 1.0f); cameraTrackToFixation[i] = trans * glm::vec4(cameraTrackToFixation[i], 1.0f); - cameraTrackToFixation[i] = glm::vec3(std::truncf(cameraTrackToFixation[i][0] * 10000) / 10000, std::truncf(cameraTrackToFixation[i][1] * 10000)/10000, -std::truncf(cameraTrackToFixation[i][2] * 10000)/10000); + cameraTrackToFixation[i] = glm::vec3(std::truncf(cameraTrackToFixation[i][0] * 10000) / 10000, std::truncf(cameraTrackToFixation[i][1] * 10000)/10000, std::truncf(cameraTrackToFixation[i][2] * 10000)/10000); settings.cameraTracks[i] = settings.bottomCenter + cameraTrackToFixation[i] ; settings.cameraAngle[i] = cameraTracksRotationMatrix * glm::mat4(settings.cameraAngle[i]) ; } diff --git a/base/renderConfig.h b/base/renderConfig.h index 52380e0..e000c5b 100644 --- a/base/renderConfig.h +++ b/base/renderConfig.h @@ -50,7 +50,7 @@ namespace PlumageConfig uint32_t startFrameIndex = 1; // ͼƬ���п�ʼ֡ uint32_t endFrameIndex = 50; // ͼƬ���н���֡ - uint32_t videoFrameRate = 25; // ��Ƶ֡�� + uint32_t videoFrameRate = 25; // video decode frameRate uint32_t selectedPhysicalDeviceIndex = 7; float fX = 565.5f; @@ -61,6 +61,7 @@ namespace PlumageConfig float cY = 238.8f; int calibrationWidth = 640.0f; int calibrationHeight = 480.0f; + glm::vec3 pedestledModelTopCenter = { 0.f,-5.f,0.f }; glm::vec3 bottomCenter = { 0.f,0.f,-6.f }; //std::vector bottomCenter = { 0.f,0.f,-6.f }; glm::vec3 bottomNormal = { 0,1,0 }; @@ -90,7 +91,7 @@ namespace PlumageConfig struct FilePath { //model path - std::string glTFModelFilePath = getAssetPath() + "models/classic_round_side_table.glb"; + std::string glTFModelFilePath = getAssetPath() + "models/cube.gltf"; std::string modelVertShaderPath = getAssetPath() + "buster_drone/shaders/glsl/mesh.vert.spv"; std::string modelFragShaderPath = getAssetPath() + "buster_drone/shaders/glsl/mesh.frag.spv"; diff --git a/data/config/yukino_rotate_trans_matrix.toml b/data/config/yukino_rotate_trans_matrix.toml index 1f1017d..49b28e4 100644 --- a/data/config/yukino_rotate_trans_matrix.toml +++ b/data/config/yukino_rotate_trans_matrix.toml @@ -19,8 +19,9 @@ videoOutputPath = "./data/output/video" [settings.camera] fovX = 1.0 fovY = 1.0 -cX = "360.0" -cY = "640.0" +cX = "540.0" +cY = "360.0" +pedestledModelTopCenter = [0,-5,0,] bottomCenter = [ -0.2356706651277691, -3.5593538438209418, -0.29007832787590515,] bottomNormal = [ 0, 1, 0,] cameraTracks = [ [ -2.693372283223423, 8.86942507751856, 6.082414133190826,], [ -2.5009900243426735, 8.869425075818562, 6.164013695350231,], [ -2.306139590254794, 8.869425074241974, 6.23953012037607,], [ -2.1090132748136514, 8.869425072790348, 6.30888888267405,], [ -1.9098056178932397, 8.86942507146512, 6.372021533519567,], [ -1.7087132134003045, 8.869425070267596, 6.428865768608335,], [ -1.5059345152599013, 8.869425069198957, 6.479365489543209,], [ -1.3016696415653264, 8.869425068260261, 6.5234708591965305,], [ -1.096120177085719, 8.869425067452436, 6.56113835089336,], [ -0.8894889743262324, 8.86942506677627, 6.592330791367039,], [ -0.6819799533371039, 8.869425066232438, 6.617017397444737,], [ -0.4737979004691806, 8.869425065821474, 6.635173806426697,], [ -0.2651482662745198, 8.869425065543783, 6.6467821001293075,], [ -0.05623696275149684, 8.869425065399643, 6.651830822568171,], [ 0.15272983986547892, 8.869425065389192, 6.6503149912637785,], [ 0.36154591657109314, 8.869425065512445, 6.642236102158621,], [ 0.5700051911083075, 8.869425065769274, 6.6276021281408655,], [ 0.7779019393407461, 8.869425066159428, 6.606427511176088,], [ 0.9850309922775832, 8.869425066682526, 6.578733148054795,], [ 1.191187938550562, 8.869425067338048, 6.544546369769799,], [ 1.3961693261433432, 8.869425068125345, 6.503900914543849,], [ 1.5997728631740733, 8.869425069043643, 6.456836894534073,], [ 1.801797617533059, 8.869425070092039, 6.403400756246106,], [ 2.002044215178488, 8.86942507126949, 6.34364523469702,], [ 2.2003150368945525, 8.86942507257484, 6.277629301372209,], [ 2.396414413317743, 8.869425074006802, 6.205418106027667,], [ 2.590148818038895, 8.869425075563958, 6.127082912395034,], [ 2.781327058590389, 8.869425077244774, 6.042701027852902,], [ 2.9697604651300264, 8.869425079047591, 5.95235572713377,], [ 3.155263076635394, 8.869425080970629, 5.856136170141924,], [ 3.3376518244249387, 8.869425083011992, 5.754137313963386,], [ 3.516746712824651, 8.869425085169665, 5.646459819154736,], [ 3.6923709968020715, 8.869425087441517, 5.533209950403287,], [ 3.8643513563922864, 8.869425089825306, 5.414499471656675,], [ 4.032518067743827, 8.869425092318682, 5.290445535825332,], [ 4.196705170615594, 8.86942509491918, 5.161170569166713,], [ 4.356750632159611, 8.869425097624239, 5.02680215046535,], [ 4.51249650682785, 8.869425100431187, 4.887472885128012,], [ 4.663789092245446, 8.869425103337253, 4.743320274318151,], [ 4.810479080896364, 8.869425106339568, 4.59448657925889,], [ 4.952421707471902, 8.869425109435173, 4.441118680838339,], [ 5.089476891736572, 8.869425112621009, 4.283367934655908,], [ 5.221509376770378, 8.869425115893934, 4.121390021652602,], [ 5.348388862451066, 8.86942511925072, 3.9553447944727225,], [ 5.469990134044616, 8.86942512268805, 3.7853961197086132,], [ 5.586193185777064, 8.869425126202534, 3.6117117161841197,], [ 5.696883339265714, 8.869425129790704, 3.4344629894363417,], [ 5.801951356692859, 8.869425133449017, 3.2538248625590835,], [ 5.901293548610311, 8.869425137173867, 3.069975603574865,], [ 5.994811876268377, 8.869425140961573, 2.8830966495059194,], [ 6.082414048368263, 8.869425144808398, 2.6933724273177404,], [ 6.164013612142444, 8.869425148710548, 2.5009901719119423,], [ 6.239530038673113, 8.86942515266417, 2.306139741348023,], [ 6.308888802364489, 8.869425156665365, 2.109013429476368,], [ 6.372021454490595, 8.86942516071018, 1.9098057761674496,], [ 6.428865690745878, 8.869425164794627, 1.7087133753244534,], [ 6.479365412732047, 8.869425168914674, 1.5059346808688276,], [ 6.523470783320401, 8.869425173066254, 1.3016698108902343,], [ 6.561138275835081, 8.86942517724527, 1.0961203501541428,], [ 6.592330717008622, 8.8694251814476, 0.8894891511620158,], [ 6.617017323667497, 8.869425185669094, 0.6819801339603713,], [ 6.635173733111383, 8.869425189905588, 0.4737980848963177,], [ 6.646782027156207, 8.8694251941529, 0.2651484545181615,], [ 6.651830749817236, 8.869425198406837, 0.05623715482050451,], [ 6.650314918614742, 8.869425202663203, -0.15272964396601307,], [ 6.642236029491115, 8.869425206917798, -0.3615457168398557,], [ 6.627602055334543, 8.869425211166423, -0.57000498754777,], [ 6.606427438110734, 8.869425215404883, -0.7779017319571613,], [ 6.578733074610449, 8.869425219628997, -0.9850307810809733,], [ 6.5445462958268825, 8.869425223834595, -1.1911877235547121,], [ 6.503900839983273, 8.869425228017526, -1.3961691073657858,], [ 6.456836819237349, 8.869425232173668, -1.599772640636078,], [ 6.403400680095485, 8.869425236298913, -1.8017973912596041,], [ 6.343645157575587, 8.86942524038919, -2.002043985198241,], [ 6.277629223164013, 8.869425244440464, -2.2003148032398308,], [ 6.20541802661782, 8.869425248448739, -2.396414176024501,], [ 6.127082831669844, 8.869425252410053, -2.590148577146673,], [ 6.042700945699973, 8.869425256320504, -2.7813268141422736,], [ 5.952355643442111, 8.869425260176229, -2.969760217172622,], [ 5.856136084802067, 8.869425263973426, -3.1552628252187622,], [ 5.754137226867484, 8.86942526770834, -3.337651569602561,], [ 5.64645973019668, 8.869425271377295, -3.516746454653367,], [ 5.533209859478804, 8.869425274976663, -3.6923707353420223,], [ 5.414499378663434, 8.869425278502897, -3.864351091706866,], [ 5.290445440663043, 8.869425281952513, -4.032517799899599,], [ 5.161170471737223, 8.869425285322107, -4.19670489968226,], [ 5.026802050672748, 8.869425288608355, -4.356750358209905,], [ 4.887472782878715, 8.869425291808014, -4.512496229937487,], [ 4.743320169521007, 8.869425294917924, -4.663788812493045,], [ 4.594486471825257, 8.86942529793502, -4.810478798363362,], [ 4.441118570682174, 8.86942530085632, -4.952421422242491,], [ 4.28336782169386, 8.869425303678947, -5.089476603897599,], [ 4.1213899058040875, 8.86942530640011, -5.221509086411263,], [ 3.955344675660005, 8.869425309017124, -5.3483885696637214,], [ 3.785395997856889, 8.869425311527408, -5.469989838923343,], [ 3.6117115912215687, 8.869425313928485, -5.586192888418477,], [ 3.4344628612942256, 8.869425316217983, -5.69688303976863,], [ 3.253824731171801, 8.869425318393645, -5.801951055158202,], [ 3.0699754688800165, 8.869425320453322, -5.901293245141022,], [ 2.8830965114443705, 8.869425322394985, -5.994811570969302,], [ 2.6933722858336724, 8.869425324216714, -6.08241374134606,], [ 2.5009900269529206, 8.869425325916712, -6.164013303505465,], [ 2.306139592865042, 8.8694253274933, -6.239529728531301,], [ 2.109013277423898, 8.869425328944924, -6.3088884908292835,], [ 1.9098056205034897, 8.869425330270154, -6.372021141674799,], [ 1.7087132160105534, 8.869425331467678, -6.428865376763567,], [ 1.5059345178701486, 8.869425332536316, -6.479365097698443,], [ 1.3016696441755753, 8.869425333475013, -6.523470467351764,], [ 1.096120179695966, 8.869425334282841, -6.561137959048594,], [ 0.8894889769364838, 8.869425334959004, -6.592330399522273,], [ 0.6819799559473531, 8.86942533550284, -6.617017005599969,], [ 0.4737979030794286, 8.8694253359138, -6.63517341458193,], [ 0.2651482688847691, 8.869425336191489, -6.646781708284539,], [ 0.05623696536174394, 8.869425336335631, -6.651830430723404,], [ -0.1527298372552283, 8.86942533634608, -6.650314599419009,], [ -0.3615459139608448, 8.869425336222829, -6.642235710313851,], [ -0.5700051884980599, 8.869425335966, -6.627601736296096,], [ -0.7779019367304971, 8.869425335575846, -6.606427119331322,], [ -0.9850309896673355, 8.86942533505275, -6.578732756210026,], [ -1.1911879359403112, 8.869425334397228, -6.544545977925031,], [ -1.3961693235330939, 8.869425333609929, -6.503900522699082,], [ -1.5997728605638264, 8.86942533269163, -6.4568365026893035,], [ -1.8017976149228097, 8.869425331643239, -6.403400364401341,], [ -2.0020442125682414, 8.869425330465784, -6.343644842852253,], [ -2.2003150342843023, 8.869425329160435, -6.277628909527444,], [ -2.3964144107074947, 8.869425327728472, -6.2054177141829,], [ -2.5901488154286483, 8.869425326171315, -6.127082520550266,], [ -2.7813270559801393, 8.8694253244905, -6.042700636008136,], [ -2.969760462519779, 8.869425322687682, -5.952355335289002,], [ -3.1552630740251466, 8.869425320764643, -5.856135778297155,], [ -3.3376518218146893, 8.869425318723282, -5.75413692211862,], [ -3.5167467102144068, 8.869425316565609, -5.646459427309967,], [ -3.692370994191821, 8.869425314293757, -5.533209558558522,], [ -3.8643513537820406, 8.869425311909968, -5.414499079811907,], [ -4.032518065133577, 8.869425309416592, -5.290445143980565,], [ -4.196705168005347, 8.869425306816094, -5.161170177321947,], [ -4.356750629549366, 8.869425304111033, -5.02680175862058,], [ -4.512496504217601, 8.869425301304087, -4.887472493283245,], [ -4.663789089635199, 8.869425298398022, -4.743319882473384,], [ -4.810479078286116, 8.869425295395704, -4.594486187414123,], [ -4.952421704861654, 8.869425292300102, -4.441118288993573,], [ -5.089476889126327, 8.869425289114265, -4.2833675428111375,], [ -5.221509374160129, 8.869425285841338, -4.121389629807837,], [ -5.348388859840816, 8.869425282484555, -3.9553444026279587,], [ -5.46999013143437, 8.869425279047224, -3.7853957278638477,], [ -5.586193183166816, 8.86942527553274, -3.6117113243393524,], [ -5.6968833366554685, 8.86942527194457, -3.43446259759157,], [ -5.801951354082612, 8.869425268286255, -3.2538244707143136,], [ -5.901293546000061, 8.869425264561407, -3.069975211730104,], [ -5.99481187365813, 8.869425260773703, -2.883096257661153,], [ -6.082414045758015, 8.869425256926874, -2.693372035472973,], [ -6.164013609532198, 8.869425253024724, -2.5009897800671714,], [ -6.239530036062868, 8.869425249071103, -2.306139349503254,], [ -6.308888799754241, 8.869425245069909, -2.1090130376316063,], [ -6.372021451880348, 8.869425241025093, -1.9098053843226832,], [ -6.428865688135632, 8.869425236940646, -1.7087129834796866,], [ -6.479365410121801, 8.8694252328206, -1.5059342890240568,], [ -6.523470780710155, 8.86942522866902, -1.3016694190454636,], [ -6.561138273224833, 8.869425224490003, -1.0961199583093804,], [ -6.592330714398375, 8.869425220287674, -0.8894887593172498,], [ -6.617017321057251, 8.86942521606618, -0.6819797421156049,], [ -6.635173730501136, 8.869425211829686, -0.47379769305154684,], [ -6.646782024545961, 8.869425207582376, -0.2651480626733911,], [ -6.65183074720699, 8.869425203328436, -0.05623676297574298,], [ -6.650314916004496, 8.86942519907207, 0.15273003581077904,], [ -6.642236026880869, 8.869425194817476, 0.36154610868462256,], [ -6.627602052724296, 8.869425190568851, 0.5700053793925426,], [ -6.606427435500486, 8.86942518633039, 0.7779021238019304,], [ -6.578733072000204, 8.869425182106276, 0.9850311729257337,], [ -6.544546293216635, 8.869425177900679, 1.1911881153994786,], [ -6.503900837373024, 8.869425173717746, 1.3961694992105522,], [ -6.4568368166271, 8.869425169561605, 1.5997730324808497,], [ -6.403400677485237, 8.869425165436363, 1.801797783104374,], [ -6.3436451549653405, 8.869425161346086, 2.0020443770430028,], [ -6.277629220553764, 8.86942515729481, 2.2003151950845985,], [ -6.205418024007574, 8.869425153286535, 2.3964145678692663,], [ -6.127082829059596, 8.86942514932522, 2.590148968991442,], [ -6.042700943089725, 8.86942514541477, 2.7813272059870426,], [ -5.9523556408318665, 8.869425141559043, 2.969760609017384,], [ -5.856136082191818, 8.869425137761848, 3.1552632170635313,], [ -5.754137224257239, 8.869425134026931, 3.3376519614473272,], [ -5.646459727586431, 8.869425130357978, 3.516746846498136,], [ -5.533209856868556, 8.86942512675861, 3.6923711271867914,], [ -5.4144993760531905, 8.869425123232377, 3.864351483551628,], [ -5.290445438052795, 8.869425119782761, 4.03251819174437,], [ -5.161170469126977, 8.869425116413167, 4.196705291527028,], [ -5.0268020480625, 8.869425113126919, 4.356750750054673,], [ -4.8874727802684665, 8.86942510992726, 4.512496621782257,], [ -4.743320166910764, 8.86942510681735, 4.6637892043378075,], [ -4.594486469215008, 8.869425103800253, 4.810479190208132,], [ -4.441118568071928, 8.869425100878951, 4.952421814087258,], [ -4.283367819083611, 8.869425098056327, 5.089476995742368,], [ -4.1213899031938395, 8.869425095335165, 5.221509478256032,], [ -3.9553446730497623, 8.869425092718151, 5.348388961508486,], [ -3.7853959952466387, 8.869425090207866, 5.469990230768113,], [ -3.611711588611321, 8.869425087806789, 5.5861932802632435,], [ -3.434462858683976, 8.86942508551729, 5.696883431613398,], [ -3.253824728561551, 8.86942508334163, 5.8019514470029705,], [ -3.069975466269775, 8.869425081281952, 5.901293636985788,], [ -2.8830965088341207, 8.869425079340289, 5.994811962814071,],] diff --git a/src/render/render.cpp b/src/render/render.cpp index 170c96e..031778d 100644 --- a/src/render/render.cpp +++ b/src/render/render.cpp @@ -1533,18 +1533,18 @@ PlumageRender::PlumageRender() float modelSize = std::max(models.scene.aabb[0][0], std::max(models.scene.aabb[1][1], models.scene.aabb[2][2])); // Center and scale model //float scale = 0.25f; - float scale =(1.0f / modelSize) * 0.1; - glm::vec3 translate = glm::vec3(models.scene.aabb[3][0], models.scene.aabb[3][1], models.scene.aabb[3][2]); + float scale =(1.0f / modelSize) * 4; + //glm::vec3 translate = glm::vec3(models.scene.aabb[3][0], models.scene.aabb[3][1], models.scene.aabb[3][2]); //translate += - modelSize / 4 * glm::vec3(models.scene.aabb[0][0], models.scene.aabb[1][1], models.scene.aabb[2][2]); //glm::vec3 translate = glm::vec3(0.f, 0.f, 0.f); //camera.setPosition(glm::vec3(0, 0, -modelSize - 2)); - + glm::vec3 translate = glm::vec3(0.f, -5.0f, 0.f); shaderDataScene.model = glm::mat4(1.0f); //translate += glm::vec3(0.0f, 0.f, 0.f) - settings.cameraFixation; shaderDataScene.model[0][0] = scale; shaderDataScene.model[1][1] = scale; shaderDataScene.model[2][2] = scale; - //shaderDataScene.model = glm::translate(shaderDataScene.model, translate); + shaderDataScene.model = glm::translate(shaderDataScene.model, translate); //camera.setPosition(glm::vec3(0, 0, -modelSize - 2)); //glm::vec3 aabbMax = glm::vec3(models.scene.aabb[0][0], models.scene.aabb[1][1], models.scene.aabb[2][2]); //glm::vec3 aabbMin = glm::vec3(models.scene.aabb[3][0], models.scene.aabb[3][1], models.scene.aabb[3][2]);