Commit dd6c6b5c authored by LAMBERT Jean-charles's avatar LAMBERT Jean-charles
Browse files

new camera path selection

parent e5ec2e94
......@@ -1030,8 +1030,7 @@ p, li { white-space: pre-wrap; }
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">1.11.0 (dev)</span></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- (new) support new RAMSES file format with particle families</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- (new) xyz/min max support for RAMSES</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- (new) add xyz min/max box settings for ramses simulations (from CLI only)</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- (new) xyz/min max support for RAMSES (GUI and CLI)</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- (new) improve camera module</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- (new) improve velocity vectors rendering on nvidia GPU</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- better objects creation when particles range< 1</p>
......
......@@ -53,22 +53,29 @@ FormOptions::FormOptions(GlobalOptions * _go, QMutex * _mutex, QWidget *parent):
connect(form.frame_dial ,SIGNAL(sliderReleased()),this,SLOT(unLockFrame()));
// camera tab
playing_camera=false;
bool stop=false;
int ipath=0;
// load camera path from ressource file
while (! stop && ipath<30) {
std::ostringstream digit;
digit << std::setfill('0')<< std::setw(2) << ipath;
std::string cam_path=GlobalOptions::RESPATH.toStdString() + "/camera/path_"+ digit.str();
QFileInfo ffile(QString(cam_path.c_str()));
if (ffile.exists()) {
form.cam_load_select->addItem(ffile.baseName());
}
ipath++;
}
// load camera file in text area
on_cam_load_select_activated(form.cam_load_select->itemText(0));
// camera list from ressource file
std::string cam_list=GlobalOptions::RESPATH.toStdString() + "/camera/camera.list";
QFile infile(QString(cam_list.c_str()));
if (infile.open(QIODevice::ReadOnly| QIODevice::Text)) {
QTextStream in(&infile);
QString line;
do {
line = in.readLine();
if (!line.isNull()) {
// load camera path from ressource file
std::string cam_path=GlobalOptions::RESPATH.toStdString() + "/camera/"+ line.toStdString();
QFileInfo ffile(QString(cam_path.c_str()));
if (ffile.exists()) {
form.cam_load_select->addItem(ffile.baseName());
}
}
} while (!line.isNull());
// load camera file in text area
on_cam_load_select_activated(form.cam_load_select->itemText(0));
}
// frame spin box
form.frame_spin->setKeyboardTracking(false);
form.frame_spin->setButtonSymbols(QAbstractSpinBox::PlusMinus);
......
......@@ -78,5 +78,12 @@
<file>../res/camera/path_03</file>
<file>../res/shaders/camera.vert.cc</file>
<file>../res/shaders/camera.frag.cc</file>
<file>../res/camera/zoom+loop+rotate</file>
<file>../res/camera/spiral</file>
<file>../res/camera/snail</file>
<file>../res/camera/line+circle</file>
<file>../res/camera/filaments</file>
<file>../res/camera/circle</file>
<file>../res/camera/camera.list</file>
</qresource>
</RCC>
......@@ -151,8 +151,12 @@ void GLSelection::selectOnArea(const int nobj, double mProj[16],double mModel[16
// selected area
for (int i=0; i<nobj; i++) {
const ParticlesObject * po = (*gpv)[i].getPartObj(); // object
float DMIN = po->getMinPhys();
float DMAX = po->getMaxPhys();
float DMIN = -1.;
float DMAX = -1.;
if (po->hasPhysic()) {
DMIN = po->getMinPhys();
DMAX = po->getMaxPhys();
}
if (po->isVisible()) { // is visible
part_data = (*gpv)[i].getPartData();// get its Data
......
......@@ -70,7 +70,7 @@ MainWindow::MainWindow(std::string _ver)
camera = new Camera(store_options);
// ------- openGL object ---------
gl_window = new glnemo::GLWindow(this,store_options,mutex_data, camera);
camera->init(GlobalOptions::RESPATH.toStdString()+"/camera/path_01");
camera->init(GlobalOptions::RESPATH.toStdString()+"/camera/circle");
// colormap object
colormap = new Colormap(store_options);
......@@ -809,6 +809,7 @@ void MainWindow::selectPart(const std::string _select, const bool first_snapshot
//connect(current_data,SIGNAL(stringStatus(QString)),status_bar, SLOT(showMessage(QString)));
current_data->initLoading(store_options);
crv = current_data->getSnapshotRange();
force_first_snapshot=true;
ComponentRange::list(crv);
//ComponentRange::list(&current_data->crv_first);
} else {
......
......@@ -19,6 +19,6 @@
#define GLNEMO2_MAJOR "1"
#define GLNEMO2_MINOR "11"
#define GLNEMO2_PATCH "0"
#define GLNEMO2_EXTRA "-devel-2018-mar-16"
#define GLNEMO2_EXTRA "-devel-2018-mar-31"
#endif // VERSION_H
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment