git-svn-id: svn://db.shs.com.ru/libs@666 a8b55f48-bf90-11e4-a774-851b48703e85

qglengine/tonemapping_proc.cpp

@@ -33,6 +33,7 @@ TonemappingProc::TonemappingProc(Renderer * rend): QThread(), r(rend),
 	timer_delim = 0;
 	frame_max = cur_max = 1.;
 	need_render_sum = exit_ = false;
+	enabled = true;
 	timer_tone = startTimer(10);
 }
 
@@ -80,7 +81,7 @@ void TonemappingProc::resize() {
 
 
 void TonemappingProc::timerEvent(QTimerEvent * e) {
-	if (!fbo_1x1.isInit()) return;
+	if (!fbo_1x1.isInit() || !enabled) return;
 	if (timer_delim == 0)
 		need_render_sum = true;
 	timer_delim = (timer_delim + 1) % 10;
@@ -122,6 +123,10 @@ void TonemappingProc::renderSum(Framebuffer & fbo_src, int index) {
 
 void TonemappingProc::run() {
 	while (!exit_) {
+		if (!enabled) {
+			msleep(100);
+			continue;
+		}
 		mutex.lock();
 		if (last_data.isEmpty()) {
 			mutex.unlock();
@@ -159,7 +164,7 @@ float TonemappingProc::calcHistogram(const QVector<QVector4D> & data) {
 
 
 bool TonemappingProc::process() {
-	if (!need_render_sum) return false;
+	if (!need_render_sum || !enabled) return false;
 	need_render_sum = false;
 	Framebuffer & fbo(fbomm.lastPlane());
 	if (fbo.queriedPoints() > 0) {
@@ -176,10 +181,6 @@ bool TonemappingProc::process() {
 
 
 float TonemappingProc::frameMax() {
+	if (!enabled) return 1.f;
 	return cur_max;
-	/*mutex.lock();
-	float ret = frame_max;
-	mutex.unlock();
-	return ret;*/
-
 }