Irrlicht cleanup: cleanup various object to use RenderingEngine #6088

nerzhul · 2017-07-02T07:59:39Z

CAO doesn't need scenemanager in addToScene
Camera doesn't need VideoDriver pointer or SceneManager in constructor
Hud doesn't need driver & scene manager in constructor
Hud doesn't need scenemanager pointer
Tile.h doesn't need IrrlichtDevice header (just SMaterial)

* CAO doesn't need scenemanager in addToScene * Camera doesn't need VideoDriver pointer or SceneManager in constructor * Hud doesn't need driver & scene manager in constructor * Hud doesn't need scenemanager pointer * Tile.h doesn't need IrrlichtDevice header (just SMaterial)

SmallJoker · 2017-07-02T08:13:52Z

src/hud.cpp

 		Inventory *inventory)
 {
-	this->driver      = driver;
-	this->smgr        = smgr;
+	driver      = RenderingEngine::get_video_driver();
 	this->guienv      = guienv;


= (of driver) should be aligned the same way as these assignments.

SmallJoker · 2017-07-02T08:14:06Z

src/hud.cpp

@@ -40,12 +40,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "touchscreengui.h"
 #endif

-Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr,
-		gui::IGUIEnvironment* guienv, Client *client, LocalPlayer *player,
+Hud::Hud(gui::IGUIEnvironment* guienv, Client *client, LocalPlayer *player,


gui::IGUIEnvironment *guienv

SmallJoker · 2017-07-02T08:17:00Z

src/content_cao.cpp

-			smgr, -1);
+		m_wield_meshnode = new WieldMeshSceneNode(
+			RenderingEngine::get_scene_manager()->getRootSceneNode(),
+			RenderingEngine::get_scene_manager(), -1);


I guess these arguments (class WieldMeshSceneNode) will be cleaned up later?

yes i think i will do it later, it was a first analysis about scenemgr but no time atm to continue this PR, waiting for merge to continue

in fact it was easy to fix, i did it

SmallJoker · 2017-07-02T08:17:50Z

src/camera.h

@@ -60,8 +60,7 @@ enum CameraMode {CAMERA_MODE_FIRST, CAMERA_MODE_THIRD, CAMERA_MODE_THIRD_FRONT};
 class Camera
 {
 public:
-	Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
-			Client *client);
+	Camera(MapDrawControl& draw_control, Client *client);


MapDrawControl &draw_control

SmallJoker · 2017-07-02T08:18:18Z

src/camera.cpp

-
-Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
-		Client *client):
+Camera::Camera(MapDrawControl& draw_control, Client *client):


MapDrawControl &draw_control here as well

SmallJoker · 2017-07-02T08:19:00Z

src/hud.h

@@ -120,8 +120,7 @@ class Hud {
 	std::string hotbar_selected_image = "";
 	bool use_hotbar_selected_image = false;

-	Hud(video::IVideoDriver *driver,scene::ISceneManager* smgr,
-		gui::IGUIEnvironment* guienv, Client *client, LocalPlayer *player,
+	Hud(gui::IGUIEnvironment* guienv, Client *client, LocalPlayer *player,


Pointer guienv again

nerzhul · 2017-07-02T08:24:20Z

i missed the old style, will fix it this evening :)

… parent

…test#6088) * Irrlicht cleanup: cleanup various object to use RenderingEngine * CAO doesn't need scenemanager in addToScene * Camera doesn't need VideoDriver pointer or SceneManager in constructor * Hud doesn't need driver & scene manager in constructor * Hud doesn't need scenemanager pointer * Tile.h doesn't need IrrlichtDevice header (just SMaterial) * WieldMeshSceneNode: only take scene, we always use scene root node as parent

…ne (minetest#6088)" This reverts commit bd91ecc.

…test#6088) * Irrlicht cleanup: cleanup various object to use RenderingEngine * CAO doesn't need scenemanager in addToScene * Camera doesn't need VideoDriver pointer or SceneManager in constructor * Hud doesn't need driver & scene manager in constructor * Hud doesn't need scenemanager pointer * Tile.h doesn't need IrrlichtDevice header (just SMaterial) * WieldMeshSceneNode: only take scene, we always use scene root node as parent

nerzhul added @ Client rendering Maintenance Tasks to keep the codebase and related parts in order, including architectural improvements labels Jul 2, 2017

nerzhul added this to the 0.5.0 milestone Jul 2, 2017

nerzhul requested a review from SmallJoker July 2, 2017 07:59

SmallJoker reviewed Jul 2, 2017

View reviewed changes

nerzhul added 2 commits July 2, 2017 19:17

Code style fixes

8e2bf50

WieldMeshSceneNode: only take scene, we always use scene root node as…

9b4a295

… parent

SmallJoker approved these changes Jul 2, 2017

View reviewed changes

SmallJoker added the One approval ✅ ◻️ label Jul 2, 2017

nerzhul merged commit 94c294b into minetest:master Jul 2, 2017

BeeeWall pushed a commit to BeeeWall/minetest that referenced this pull request Jul 6, 2017

Revert "Irrlicht cleanup: cleanup various object to use RenderingEngi…

988ed19

…ne (minetest#6088)" This reverts commit bd91ecc.

nerzhul added this to Done in Minetest 5.0.0 blockers Jul 16, 2017

nerzhul deleted the irrlicht_cleanup2 branch February 18, 2018 21:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Irrlicht cleanup: cleanup various object to use RenderingEngine #6088

Irrlicht cleanup: cleanup various object to use RenderingEngine #6088

nerzhul commented Jul 2, 2017

SmallJoker Jul 2, 2017

SmallJoker Jul 2, 2017

SmallJoker Jul 2, 2017

nerzhul Jul 2, 2017

nerzhul Jul 2, 2017

SmallJoker Jul 2, 2017

SmallJoker Jul 2, 2017

SmallJoker Jul 2, 2017

nerzhul commented Jul 2, 2017

Irrlicht cleanup: cleanup various object to use RenderingEngine #6088

Irrlicht cleanup: cleanup various object to use RenderingEngine #6088

Conversation

nerzhul commented Jul 2, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nerzhul commented Jul 2, 2017