From e5efa694c159817a2641e9e82eb47a08644c84a7 Mon Sep 17 00:00:00 2001
From: Sergey Linev <S.Linev@gsi.de>
Date: Wed, 16 Jan 2019 13:52:16 -0800
Subject: [PATCH] eve7: add EveScene.js which is responsible for all scene
 operations

---
 etc/eve7/EveManager.js          |  71 +++---
 etc/eve7/EveScene.js            | 253 ++++++++++++++++++++
 etc/eve7/EveTable.controller.js |  10 +-
 etc/eve7/GL.controller.js       | 401 ++++++++------------------------
 4 files changed, 384 insertions(+), 351 deletions(-)
 create mode 100644 etc/eve7/EveScene.js

diff --git a/etc/eve7/EveManager.js b/etc/eve7/EveManager.js
index c0dc37cabdcf2..c6008ac2c6d4b 100644
--- a/etc/eve7/EveManager.js
+++ b/etc/eve7/EveManager.js
@@ -84,18 +84,31 @@
       this.handle.Send(JSON.stringify(obj));
    }
 
-   /** Configure dependency for given element id - invoke function when element changed */
-   EveManager.prototype.Register = function(id, receiver, func_name) {
+   /** Configure receiver for scene-respective events. Following event used:
+    * onSceneChanged */
+   EveManager.prototype.RegisterSceneReceiver = function(id, receiver, func_name) {
 
       var elem = this.GetElement(id);
-
+      
       if (!elem) return;
 
       if (!elem.$receivers) elem.$receivers = [];
 
-      elem.$receivers.push({ obj: receiver, func: func_name });
+      if (elem.$receivers.indexOf(receiver)<0)
+         elem.$receivers.push(receiver);
    }
 
+   /** Invoke function on all receiver of scene events - when such function exists */
+   EveManager.prototype.callSceneReceivers = function (scene, fname, arg) {
+      if (scene.$receivers) {
+          for (var i=0; i < scene.$receivers.length; i++) {
+              var receiver = scene.$receivers[i];
+              if (typeof receiver[fname] == "function")
+                 receiver[fname](arg);
+          }
+      }
+  }
+  
    /** returns master id for given element id
     * master id used for highlighting element in all dependent views */
    EveManager.prototype.GetMasterId = function(elemid) {
@@ -185,13 +198,10 @@
    }
 
    EveManager.prototype.ProcessModified = function(sceneid) {
-      var elem = this.map[sceneid];
-      if (!elem || !elem.$modified || !elem.$receivers) return;
-
-      for (var k=0;k<elem.$receivers.length;++k) {
-         var f = elem.$receivers[k];
-         f.obj[f.func](sceneid, elem);
-      }
+      var elem = this.GetElement(sceneid);
+      if (!elem || !elem.$modified) return;
+      
+      this.callSceneReceivers(elem, "onSceneChanged", sceneid);
 
       delete elem.$modified;
    }
@@ -262,24 +272,18 @@
       this.last_json = null;
       this.scene_changes = msg;
 
-      var scene = this.map[msg.header.fSceneId];
+      var scene = this.GetElement(msg.header.fSceneId);
 
       // notify scenes for beginning of changes and
       // notify for element removal
       var removedIds = msg.header["removedElements"];
 
-      if (scene.$receivers)
-      {
-         for (var i = 0; i < scene.$receivers.length; i++)
-         {
-            var controller = scene.$receivers[i].obj;
-            controller.beginChanges();
-            for (var r = 0; r != removedIds.length; ++r)
-            {
-               controller.elementRemoved(removedIds[r]);
-            }
-         }
-      }
+      // do we need this?
+      this.callSceneReceivers(scene, "beginChanges");
+      
+      for (var r = 0; r < removedIds.length; ++r)
+         this.callSceneReceivers(scene, "elementRemoved", removedIds[r]);
+
       // wait for binary if needed
       if (msg.header.fTotalBinarySize)
       {
@@ -295,16 +299,6 @@
    //______________________________________________________________________________
 
 
-    EveManager.prototype.callSceneReceivers = function (scene, fname, el) {
-        if (scene.$receivers) {
-            for (var i=0; i != scene.$receivers.length; i++) {
-                var receiver = scene.$receivers[i].obj;
-                receiver[fname](el);
-            }
-        }
-    }
-
-
    EveManager.prototype.PostProcessSceneChanges = function()
    {
       if (!this.scene_changes) return;
@@ -365,12 +359,7 @@
          }
       }
 
-      if (scene.$receivers) {
-         for (var i=0; i != scene.$receivers.length; i++) {
-            var ctrl =  scene.$receivers[i].obj;
-            if (ctrl) ctrl.endChanges();
-         }
-      }
+      this.callSceneReceivers(scene, "endChanges");
 
       var treeRebuild = header.removedElements.length || (arr.length != nModified );
 
@@ -394,7 +383,7 @@
       if (!ids) return;
 
       for (var n=0;n<ids.length;++n) {
-         var element = this.map[ids[n]];
+         var element = this.GetElement(ids[n]);
          if (!element) {
             console.log("try to delete non-existing element with id", ids[n]);
             continue;
diff --git a/etc/eve7/EveScene.js b/etc/eve7/EveScene.js
new file mode 100644
index 0000000000000..f4c0b3810ce3a
--- /dev/null
+++ b/etc/eve7/EveScene.js
@@ -0,0 +1,253 @@
+/// @file EveScene.js
+
+(function( factory ) {
+   if ( typeof define === "function" && define.amd ) {
+      define( ['JSRootCore'], factory );
+   } else if (typeof exports === 'object' && typeof module !== 'undefined') {
+      factory(require("./JSRootCore.js"));
+   } else {
+      if (typeof JSROOT == 'undefined')
+        throw new Error('JSROOT is not defined', 'EveScene.js');
+
+      factory(JSROOT);
+   }
+} (function(JSROOT) {
+
+   "use strict";
+   
+   console.log("loading EveScene.js");
+
+   /// constructor, handle for REveScene class
+   
+   function EveScene(mgr,scene,viewer)
+   {
+      this.mgr = mgr;
+      this.scene = scene;
+      this.id = scene.fSceneId;
+      this.viewer = viewer;
+      this.creator = new JSROOT.EVE.EveElements();
+      this.creator.useIndexAsIs = (JSROOT.GetUrlOption('useindx') !== null);
+      this.id2obj_map = {};
+      
+      // register ourself for scene events
+      this.mgr.RegisterSceneReceiver(scene.fSceneId, this);
+   }
+   
+   EveScene.prototype.hasRenderData = function(elem)
+   {
+      if (elem===undefined)          
+         elem = this.mgr.GetElement(this.id);
+      
+      if (!elem) return false;
+      if (elem.render_data) return true;
+      if (elem.childs)
+         for (var k = 0; k < elem.childs.length; ++k)
+            if (this.hasRenderData(elem.childs[k])) return true;
+      return false;
+   }
+   
+   EveScene.prototype.makeGLRepresentation = function(elem)
+   {
+      if (!elem.render_data) return null;
+      var fname = elem.render_data.rnr_func;
+      var obj3d = this.creator[fname](elem, elem.render_data);
+      if (obj3d)
+      {
+         obj3d._typename = "THREE.Mesh";
+
+         // SL: this is just identifier for highlight, required to show items on other places, set in creator
+         obj3d.geo_object = elem.fMasterId || elem.fElementId;
+         obj3d.geo_name = elem.fName; // used for highlight
+
+         //AMT: reference needed in MIR callback
+         obj3d.eveId = elem.fElementId;
+
+         if (elem.render_data.matrix)
+         {
+            obj3d.matrixAutoUpdate = false;
+            obj3d.matrix.fromArray( elem.render_data.matrix );
+            obj3d.updateMatrixWorld(true);
+         }
+         return obj3d;
+      }
+   }
+   
+   EveScene.prototype.create3DObjects = function(res3d, all_ancestor_children_visible, elem0)
+   {
+      if (elem0 === undefined)          
+         elem0 = this.mgr.GetElement(this.id);
+
+      if (!elem0 || !elem0.childs) return;
+      
+      for (var k = 0; k < elem0.childs.length; ++k)
+      {
+         var elem = elem0.childs[k];
+         if (elem.render_data)
+         {
+            var fname = elem.render_data.rnr_func, obj3d = null;
+            if (!this.creator[fname])
+            {
+               console.error("Function " + fname + " missing in creator");
+            }
+            else
+            {
+               var obj3d = this.makeGLRepresentation(elem);
+               if (obj3d)
+               {
+                  // MT - should maintain hierarchy ????
+                  // Easier to remove ... but might need sub-class of
+                  // Object3D to separate "graphical" children and structural children.
+
+                  res3d.push(obj3d);
+                  
+                  this.id2obj_map[elem.fElementId] = obj3d;
+
+                  obj3d.visible = elem.fRnrSelf && all_ancestor_children_visible;
+                  obj3d.all_ancestor_children_visible = all_ancestor_children_visible;
+               }
+            }
+         }
+
+         this.create3DObjects(res3d, elem.fRnrChildren && all_ancestor_children_visible, elem);
+      }
+   } 
+   
+   /** method insert all objects into three.js container */
+   EveScene.prototype.redrawScene = function()
+   {
+      if (!this.viewer) return;
+      
+      var res3d = [];
+      this.create3DObjects(res3d, true);
+      
+      var cont = this.viewer.getThreejsContainer("scene" + this.id);
+      while (cont.children.length > 0)
+         cont.remove(cont.children[0]);
+      
+      for (var k = 0; k < res3d.length; ++k)
+         cont.add(res3d[k]);
+      
+      this.viewer.render();
+   }
+   
+   EveScene.prototype.getObj3D = function(elementId)
+   {
+      return this.id2obj_map[elementId];
+   }
+
+   EveScene.prototype.update3DObjectsVisibility = function(arr, all_ancestor_children_visible)
+   {
+      if (!arr) return;
+
+      for (var k = 0; k < arr.length; ++k)
+      {
+         var elem = arr[k];
+         if (elem.render_data)
+         {
+            var obj3d = this.getObj3D(elem.fElementId);
+            if (obj3d)
+            {
+               obj3d.visible = elem.fRnrSelf && all_ancestor_children_visible;
+               obj3d.all_ancestor_children_visible = all_ancestor_children_visible;
+            }
+         }
+
+         this.update3DObjectsVisibility(elem.childs, elem.fRnrChildren && all_ancestor_children_visible);
+      }
+   }
+   
+   EveScene.prototype.visibilityChildrenChanged = function(el)
+   {
+      console.log("visibility children changed ", this.mgr, el);
+
+      if (el.childs)
+      {
+         // XXXX Overkill, but I don't have obj3d for all elements.
+         // Also, can do this traversal once for the whole update package,
+         // needs to be managed from EveManager.js.
+         // Or marked here and then recomputed before rendering (probably better).
+
+         var scene = this.mgr.GetElement(el.fSceneId);
+
+         this.update3DObjectsVisibility(scene.childs, true);
+
+         if (this.viewer)
+            this.viewer.render();
+      }
+   }
+   
+   EveScene.prototype.colorChanged = function(el)
+   {
+      console.log("color change ", el.fElementId, el.fMainColor);
+
+      this.replaceElement(el);
+   }
+
+   EveScene.prototype.replaceElement = function(el)
+   {
+      if (!this.viewer) return;
+      
+      var obj3d = this.getObj3D(el.fElementId);
+      
+      var container = this.viewer.getThreejsContainer("scene" + this.id);
+
+      container.remove(obj3d);
+
+      obj3d = this.makeGLRepresentation(el);
+
+      container.add(obj3d);
+      
+      this.id2obj_map[el.fElementId] = obj3d;
+      
+      this.viewer.render();
+   }
+   
+   EveScene.prototype.elementAdded = function(el) {
+      if (!this.viewer) return;
+      
+      var obj3d =  this.makeGLRepresentation(el);
+      if (!obj3d) return;
+      
+      var container = this.viewer.getThreejsContainer("scene" + this.id);
+
+      container.add(obj3d);
+      console.log("element added ", el);
+      
+      this.viewer.render();
+   }
+   
+   EveScene.prototype.visibilityChanged = function(el)
+   {
+      var obj3d = this.getObj3D( el.fElementId );
+
+      if (obj3d)
+      {
+         obj3d.visible = obj3d.all_ancestor_children_visible && el.fRnrSelf;
+      }
+
+      if (this.viewer)
+         this.viewer.render();
+   }
+
+   
+   EveScene.prototype.elementRemoved = function() {
+   }
+   
+   EveScene.prototype.beginChanges = function() {
+   }
+   
+   EveScene.prototype.endChanges = function() {
+   }
+   
+   EveScene.prototype.onSceneChanged = function(id)
+   {
+      console.log("scene changed", id);
+         
+      this.redrawScene();
+   }
+
+   JSROOT.EVE.EveScene = EveScene;
+
+   return JSROOT;
+
+}));
diff --git a/etc/eve7/EveTable.controller.js b/etc/eve7/EveTable.controller.js
index 67dbbfb79c18d..24600f7376a79 100644
--- a/etc/eve7/EveTable.controller.js
+++ b/etc/eve7/EveTable.controller.js
@@ -36,7 +36,7 @@ sap.ui.define([
             var scene = element.childs[k];
             console.log("FOUND scene", scene.fSceneId);
 
-            this.mgr.Register(scene.fSceneId, this, "onElementChanged");
+            this.mgr.RegisterSceneReceiver(scene.fSceneId, this);
             
             this.setEveData();
          }
@@ -122,7 +122,7 @@ sap.ui.define([
       
       onLoadScripts: function() {
          this._load_scripts = true;
-         this.checkScences();
+         this.checkScenes();
       },
       acm:function()
       {
@@ -133,7 +133,7 @@ sap.ui.define([
          if (this.mgr) this.mgr.Unregister(this);
       },
 
-      onElementChanged: function(id, element) {
+      onSceneChanged: function(element, id) {
          console.log("!!!CHANGED", id);
 
          this.setEveData();
@@ -157,10 +157,10 @@ sap.ui.define([
          // only when rendering completed - register for modify events
          var element = this.mgr.GetElement(this.elementid);
 
-         this.checkScences();
+         this.checkScenes();
       },
 
-      checkScences: function() {
+      checkScenes: function() {
       },
 
       toggleTableEdit: function() {
diff --git a/etc/eve7/GL.controller.js b/etc/eve7/GL.controller.js
index 1042bc0d64302..95f6e2d3f03f1 100644
--- a/etc/eve7/GL.controller.js
+++ b/etc/eve7/GL.controller.js
@@ -42,13 +42,9 @@ sap.ui.define([
 
          this.mgr.RegisterHighlight(this, "onElementHighlight");
 
-         JSROOT.AssertPrerequisites("geom;user:evedir/EveElements.js", this.onLoadScripts.bind(this));
+         JSROOT.AssertPrerequisites("geom;user:evedir/EveElements.js;evedir/EveScene.js", this.onLoadScripts.bind(this));
 
-         // this.checkScences();
-
-         this.id2obj_map = {};
       },
-      
 
       // MT-HAKA
       createThreejsRenderer: function()
@@ -78,38 +74,61 @@ sap.ui.define([
 
          // -------
 
-         var sphere = new THREE.SphereGeometry( 0.1, 8, 8 );
+         // var sphere = new THREE.SphereGeometry( 0.1, 8, 8 );
          // var lamp = new THREE.DirectionalLight( 0xff5050, 0.5 );
          var lampR = new THREE.PointLight( 0xff5050, 0.7 );
-         lampR.add(new THREE.Mesh( sphere, new THREE.MeshBasicMaterial( { color: lampR.color } ) ));
+         // lampR.add(new THREE.Mesh( sphere, new THREE.MeshBasicMaterial( { color: lampR.color } ) ));
          lampR.position.set(2, 2, -2);
          this.scene.add( lampR );
 
          var lampG = new THREE.PointLight( 0x50ff50, 0.7 );
-         lampG.add(new THREE.Mesh( sphere, new THREE.MeshBasicMaterial( { color: lampG.color } ) ));
+         // lampG.add(new THREE.Mesh( sphere, new THREE.MeshBasicMaterial( { color: lampG.color } ) ));
          lampG.position.set(-2, 2, 2);
          this.scene.add( lampG );
 
          var lampB = new THREE.PointLight( 0x5050ff, 0.7 );
-         lampB.add(new THREE.Mesh( sphere, new THREE.MeshBasicMaterial( { color: lampB.color } ) ));
+         // lampB.add(new THREE.Mesh( sphere, new THREE.MeshBasicMaterial( { color: lampB.color } ) ));
          lampB.position.set(2, 2, 2);
          this.scene.add( lampB );
 
-         var plane = new THREE.GridHelper(20, 20, 0x80d080, 0x8080d0);
-         this.scene.add(plane);
+         //var plane = new THREE.GridHelper(20, 20, 0x80d080, 0x8080d0);
+         //this.scene.add(plane);
       },
 
+      /** returns container for 3d objects */
+      getThreejsContainer: function(name) 
+      {
+         var prnt = null;
+         
+         if (!direct_threejs)
+            prnt = this.geo_painter.getExtrasContainer();
+         else
+            prnt = this.scene;
+         
+         for (var k=0;k<prnt.children.length;++k)
+            if (prnt.children[k]._eve_name === name) 
+               return prnt.children[k];
+         
+         var obj3d = new THREE.Object3D();
+         obj3d._eve_name = name;
+         prnt.add(obj3d);
+         return obj3d;
+      },
+      
       // MT-HAKA
       render: function()
       {
          if (!direct_threejs) {
-            if (this.geo_painter) this.geo_painter.Render3D();
+            if (this.geo_painter) {
+               if (!this.first_time_render) {
+                  this.first_time_render = true;
+                  this.geo_painter.adjustCameraPosition(true);
+               }
+               this.geo_painter.Render3D();
+            }
             return;
          }
          
-         
-         console.log("render");
-
          if ( ! this.dom_registered)
          {
             this.getView().getDomRef().appendChild( this.renderer.domElement );
@@ -117,7 +136,7 @@ sap.ui.define([
             //this.controls = new THREE.OrbitControls( this.camera);
             this.controls = new THREE.OrbitControls( this.camera, this.getView().getDomRef() );
 
-            this.controls.addEventListener( 'change', this.onThreeChange.bind(this) );
+            this.controls.addEventListener( 'change', this.render.bind(this) );
 
             this.dom_registered = true;
 
@@ -139,7 +158,7 @@ sap.ui.define([
             console.log("scene bbox ", sbbox, ", camera_pos ", posV, ", look_at ", this.rot_center);
          }
 
-         console.log(this.camera);
+         // console.log(this.camera);
 
          //console.log(this.controls);
          //console.log(this.getView().getDomRef());
@@ -152,22 +171,10 @@ sap.ui.define([
          this.renderer.render( this.scene, this.camera );
       },
 
-      onThreeChange: function(etypetarget)
-      {
-         // console.log("THREE change ", etypetarget, event);
-
-         // XXXX update controller target to rot_center?
-
-         this.render();
-      },
-
       onLoadScripts: function()
       {
          this._load_scripts = true;
-         // only when scripts loaded, one could create objects
-         this.creator = new JSROOT.EVE.EveElements();
-         this.creator.useIndexAsIs = (JSROOT.GetUrlOption('useindx') !== null);
-         this.checkScences();
+         this.checkViewReady();
       },
 
       onManagerUpdate: function()
@@ -186,7 +193,7 @@ sap.ui.define([
 
          this.elementid = found.fElementId;
          this.kind = (found.fName == "Default Viewer") ? "3D" : "2D";
-         this.checkScences();
+         this.checkViewReady();
 
       },
 
@@ -196,20 +203,6 @@ sap.ui.define([
          if (this.mgr) this.mgr.Unregister(this);
       },
 
-      onElementChanged: function(id, element)
-      {
-         if (direct_threejs) {
-            console.log("onElementChanged -- GRRR apparently still used", id, element);
-            throw "GRRR";
-            
-         } else {
-            this.checkScences();
-            
-         }
-
-         // this.checkScences();
-      },
-
       onAfterRendering: function()
       {
 
@@ -218,123 +211,94 @@ sap.ui.define([
          // TODO: should be specified somehow in XML file
          this.getView().$().css("overflow", "hidden").css("width", "100%").css("height", "100%").parent().css("overflow", "hidden");
 
-         this.checkScences();
+         this.checkViewReady();
       },
-
-      checkScences: function()
+      
+      createScenes: function()
       {
-         if (!this._load_scripts || !this._render_html || !this.elementid) return;
-         
-         if (direct_threejs) this.createThreejsRenderer();
-
-         if (!this.registered_for_change)
-         {
-            this.registered_for_change = true;
-
-            // only when rendering completed - register for modify events
-            var element = this.mgr.GetElement(this.elementid);
-
-            // loop over scene and add dependency
-            for (var k=0;k<element.childs.length;++k)
-            {
-               var scene = element.childs[k];
-               this.mgr.Register(scene.fSceneId, this, "onElementChanged");
-            }
-         }
+         if (this.created_scenes !== undefined) return;
+         this.created_scenes = [];
 
-         // start drawing only when all scenes has childs
-         // this is configured view
-         var element   = this.mgr.GetElement(this.elementid),
-             allok     = true,
-             anyextras = false;
+         // only when rendering completed - register for modify events
+         var element = this.mgr.GetElement(this.elementid);
 
          // loop over scene and add dependency
          for (var k=0;k<element.childs.length;++k)
          {
-            var scene_info = element.childs[k];
-            if ( ! scene_info) { allok = false; break; }
-            var scene = this.mgr.GetElement(scene_info.fSceneId);
-            if (this.hasExtras(scene)) anyextras = true;
-         }
+            var scene = element.childs[k];
+            this.mgr.RegisterSceneReceiver(scene.fSceneId, this);
 
-         if (allok && anyextras) this.drawGeometry();
+            this.created_scenes.push(new JSROOT.EVE.EveScene(this.mgr, scene, this));
+         }
          
-         if (direct_threejs) this.render();
       },
+      
+      redrawScenes: function() {
+         for (var k=0;k<this.created_scenes.length;++k)
+            this.created_scenes[k].redrawScene();
+      },
+      
 
-      drawGeometry: function()
+      /** checks if all initialization is performed */
+      checkViewReady: function()
       {
-         if (!direct_threejs) {
+         if (!this._load_scripts || !this._render_html || !this.elementid) return;
          
-            var options = "";
-            if (this.kind != "3D") options = "ortho_camera";
-
-            if (this.geo_painter) {
-
-               // when geo painter alreay exists - clear all our additional objects
-               this.geo_painter.clearExtras();
-
-               this.geo_painter.ResetReady();
-
-            } else {
-
-               // TODO: should be specified somehow in XML file
-               this.getView().$().css("overflow", "hidden").css("width", "100%").css("height", "100%");
-
-               this.geo_painter = JSROOT.Painter.CreateGeoPainter(this.getView().getDomRef(), null, options);
-            }
-
-            this.painter_ready = false;
-            // assign callback function - when needed
-            this.geo_painter.WhenReady(this.onGeomertyDrawn.bind(this));
+         if (direct_threejs) {
+            this.createThreejsRenderer();
+            this.createScenes();
+            this.redrawScenes();
+            return;
+         }
+         
+         if (this.geo_painter) {
+            this.redrawScenes();
+            return;
          }
 
-         // now loop over all  scene and create three.js objects
-
-         // top scene element
-         var element = this.mgr.GetElement(this.elementid);
+         
+         var options = "";
+         if (this.kind != "3D") options = "ortho_camera";
 
-         // loop over scene and add dependency
-         for (var k = 0; k < element.childs.length; ++k)
-         {
-            var scene_info = element.childs[k];
-            if ( ! scene_info) continue;
-            var scene = this.mgr.GetElement(scene_info.fSceneId);
 
-            if (scene && scene.childs)
-               this.create3DObjects(scene.childs, true);
-         }
+         // TODO: should be specified somehow in XML file
+         this.getView().$().css("overflow", "hidden").css("width", "100%").css("height", "100%");
 
-         // if geometry detected in the scenes, it will be used to display
+         this.geo_painter = JSROOT.Painter.CreateGeoPainter(this.getView().getDomRef(), null, options);
 
-         if (!direct_threejs) {
-            this.geo_painter.AssignObject(null);
+         this.painter_ready = false;
+         // assign callback function - when needed
+         this.geo_painter.WhenReady(this.onGeoPainterReady.bind(this));
 
-            this.geo_painter.prepareObjectDraw(null); // and now start everything
+         this.geo_painter.AssignObject(null);
 
-            // AMT temporary here, should be set in camera instantiation time
-            if (this.geo_painter._camera.type == "OrthographicCamera") {
-               this.geo_painter._camera.left = -this.getView().$().width();
-               this.geo_painter._camera.right = this.getView().$().width();
-               this.geo_painter._camera.top = this.getView().$().height();
-               this.geo_painter._camera.bottom = -this.getView().$().height();
-               this.geo_painter._camera.updateProjectionMatrix();
-               this.geo_painter.Render3D();
-            }
-         } else {
-            this.render();
-         }
+         this.geo_painter.prepareObjectDraw(null); // and now start everything
       },
 
-      onGeomertyDrawn: function(painter) {
+      onGeoPainterReady: function(painter) {
+
+         // AMT temporary here, should be set in camera instantiation time
+         if (this.geo_painter._camera.type == "OrthographicCamera") {
+            this.geo_painter._camera.left = -this.getView().$().width();
+            this.geo_painter._camera.right = this.getView().$().width();
+            this.geo_painter._camera.top = this.getView().$().height();
+            this.geo_painter._camera.bottom = -this.getView().$().height();
+            this.geo_painter._camera.updateProjectionMatrix();
+         }
+         
          this.painter_ready = true;
          this.geo_painter._highlight_handlers = [ this ]; // register ourself for highlight handling
          this.last_highlight = null;
+         
+         // create only when geo painter is ready
+         this.createScenes();
+         this.redrawScenes();
       },
 
       /// function called by GeoPainter, when mesh is highlighted
       /// forward message to the EveManager to redistribute event to all other drawings
       HighlightMesh: function(mesh, color, geo_object) {
+         
          if (this.last_highlight === geo_object) return;
          this.last_highlight = geo_object;
          this.mgr.ProcessHighlight(this, geo_object, geo_object ? 0 : 100);
@@ -355,103 +319,6 @@ sap.ui.define([
          this.geo_painter.HighlightMesh(null, null, masterid, null, true);
       },
 
-      makeGLRepresentation: function(elem)
-      {
-         if (!elem.render_data) return null;
-         var fname = elem.render_data.rnr_func;
-         var obj3d = this.creator[fname](elem, elem.render_data);
-         if (obj3d)
-         {
-            obj3d._typename = "THREE.Mesh";
-
-            // SL: this is just identifier for highlight, required to show items on other places, set in creator
-            // obj3d.geo_object = elem.fMasterId || elem.fElementId;
-            // obj3d.geo_name = elem.fName; // used for highlight
-
-            //AMT: reference needed in MIR callback
-            obj3d.eveId = elem.fElementId;
-
-            if (elem.render_data.matrix)
-            {
-               obj3d.matrixAutoUpdate = false;
-               obj3d.matrix.fromArray( elem.render_data.matrix );
-               obj3d.updateMatrixWorld(true);
-            }
-            return obj3d;
-         }
-      },
-
-      create3DObjects: function(arr, all_ancestor_children_visible)
-      {
-         if (!arr) return;
-
-         for (var k = 0; k < arr.length; ++k)
-         {
-            var elem = arr[k];
-            if (elem.render_data)
-            {
-               var fname = elem.render_data.rnr_func, obj3d = null;
-               if (!this.creator[fname])
-               {
-                  console.error("Function " + fname + " missing in creator");
-               }
-               else
-               {
-                  var obj3d = this.makeGLRepresentation(elem);
-                  if (obj3d)
-                  {
-                     // MT - should maintain hierarchy ????
-                     // Easier to remove ... but might need sub-class of
-                     // Object3D to separate "graphical" children and structural children.
-
-                     if (direct_threejs)
-                        this.scene.add(obj3d);
-                     else
-                        this.geo_painter.addExtra(obj3d);
-                     
-                     this.id2obj_map[elem.fElementId] = obj3d;
-
-                     obj3d.visible = elem.fRnrSelf && all_ancestor_children_visible;
-                     obj3d.all_ancestor_children_visible = all_ancestor_children_visible;
-                  }
-               }
-            }
-
-            this.create3DObjects(elem.childs, elem.fRnrChildren && all_ancestor_children_visible);
-         }
-      },
-
-      update3DObjectsVisibility: function(arr, all_ancestor_children_visible)
-      {
-         if (!arr) return;
-
-         for (var k = 0; k < arr.length; ++k)
-         {
-            var elem = arr[k];
-            if (elem.render_data)
-            {
-               var obj3d = this.getObj3D(elem.fElementId);
-               if (obj3d)
-               {
-                  obj3d.visible = elem.fRnrSelf && all_ancestor_children_visible;
-                  obj3d.all_ancestor_children_visible = all_ancestor_children_visible;
-               }
-            }
-
-            this.update3DObjectsVisibility(elem.childs, elem.fRnrChildren && all_ancestor_children_visible);
-         }
-      },
-
-      hasExtras: function(elem)
-      {
-         if (!elem) return false;
-         if (elem.render_data) return true;
-         if (elem.childs)
-            for (var k = 0; k < elem.childs.length; ++k)
-               if (this.hasExtras(elem.childs[k])) return true;
-         return false;
-      },
-
       onResize: function(event) {
          // use timeout
          // console.log("resize painter")
@@ -466,84 +333,8 @@ sap.ui.define([
          this.getView().$().css("overflow", "hidden").css("width", "100%").css("height", "100%");
          if (this.geo_painter)
             this.geo_painter.CheckResize();
-      },
-
-      colorChanged: function(el)
-      {
-         console.log("color change ", el.fElementId, el.fMainColor);
-
-         this.replaceElement(el);
-      },
-
-      replaceElement: function(el)
-      {
-         var obj3d = this.getObj3D(el.fElementId);
-         
-         var container = this.scene || this.geo_painter.getExtrasContainer();
-
-         container.remove(obj3d);
-
-         obj3d = this.makeGLRepresentation(el);
-
-         container.add(obj3d);
-         this.id2obj_map[el.fElementId] = obj3d;
-
-         this.render();
-      },
-
-      getObj3D : function(elementId)
-      {
-         if (this.id2obj_map[elementId] === undefined)
-            return null;
-         else
-            return this.id2obj_map[elementId];
-      },
-
-      visibilityChanged: function(el)
-      {
-         var obj3d = this.getObj3D( el.fElementId );
-
-         if (obj3d)
-         {
-            obj3d.visible = obj3d.all_ancestor_children_visible && el.fRnrSelf;
-         }
-
-         this.render();
-      },
-
-      visibilityChildrenChanged: function(el)
-      {
-         console.log("visibility children changed ", this.mgr, el);
-
-         if (el.childs)
-         {
-            // XXXX Overkill, but I don't have obj3d for all elements.
-            // Also, can do this traversal once for the whole update package,
-            // needs to be managed from EveManager.js.
-            // Or marked here and then recomputed before rendering (probably better).
-
-            var scene = this.mgr.GetElement(el.fSceneId);
-
-            this.update3DObjectsVisibility(scene.childs, true);
-
-            this.render();
-         }
-      },
-       elementAdded: function(el) {
-         var obj3d =  this.makeGLRepresentation(el);
-         if (obj3d) {
-            this.geo_painter.addExtra(obj3d);
-            this.geo_painter.getExtrasContainer().add(obj3d);
-         }
-           console.log("element added ", obj3d, el);
-         this.geo_painter.Render3D(-1);           
-      },
-      elementRemoved: function() {
-      },
-      beginChanges: function() {
-      },
-      endChanges: function() {
       }
+      
    });
 
 });