slapin/ogre-prototype
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Remove unneeded code

Browse Source
This commit is contained in:
Sergey Lapin
2025-07-09 15:19:34 +03:00
parent 99b711f42f
commit f7db2130a8
4 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Bootstrap.cpp
View File

@@ -9,7 +9,6 @@
#include "OgreApplicationContext.h"
#include "Bullet/OgreBullet.h"
#include "BulletCollision/CollisionDispatch/btGhostObject.h"
#include "btKinematicCharacterController.h"
#include "LinearMath/btTransform.h"
#include "OgrePageManager.h"
@@ -225,7 +224,6 @@ class CharacterController : public OgreBites::InputListener, Ogre::FrameListener
// btRigidBody *mRigidBody;
btCompoundShape *mCollisionShape;
btPairCachingGhostObject *mGhostObject;
btKinematicCharacterController *mController;
public:
CharacterController(Ogre::SceneNode *camNode, Ogre::Camera *cam, Ogre::SceneManager *scnMgr, MainWorld *world);
~CharacterController();
@@ -312,7 +310,6 @@ CharacterController::CharacterController(
, world(world)
, mCollisionShape(nullptr)
, mGhostObject(nullptr)
, mController(nullptr)
{
setupBody();

6
CMakeLists.txt
View File

@@ -175,8 +175,6 @@ add_custom_command(
${CMAKE_BINARY_DIR}/resources/shaderlib
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/resources/terrain
${CMAKE_BINARY_DIR}/resources/terrain
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/characters
${CMAKE_BINARY_DIR}/characters
# COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/lua-scripts
# ${CMAKE_BINARY_DIR}/lua-scripts
# COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/skybox
@@ -219,8 +217,6 @@ set(WATER_SRC
water.program
water.frag
water.vert
depth.frag
depth.vert
water.compositor
waves2.png
)
@@ -258,6 +254,8 @@ add_custom_command(
COMMAND ${BLENDER} -b -Y -P ${CMAKE_SOURCE_DIR}/assets/blender/scripts/export_models.py
# COMMAND ${BLENDER} -b -Y -P ${CMAKE_SOURCE_DIR}/assets/blender/scripts/export_ogre_scene.py
COMMAND echo rm -Rf ${CMAKE_SOURCE_DIR}/characters/male/*.material ${CMAKE_SOURCE_DIR}/characters/female/*.material
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/characters
${CMAKE_BINARY_DIR}/characters
DEPENDS ${CMAKE_SOURCE_DIR}/assets/blender/scripts/export_models.py ${CMAKE_SOURCE_DIR}/assets/blender/scripts/import_vrm.py
${CMAKE_SOURCE_DIR}/assets/vroid/buch1.vrm
${CMAKE_SOURCE_DIR}/assets/vroid/buch1-chibi.vrm

3
Procedural.cpp
View File

@@ -9,7 +9,6 @@
#include "OgreApplicationContext.h"
#include "Bullet/OgreBullet.h"
#include "BulletCollision/CollisionDispatch/btGhostObject.h"
#include "btKinematicCharacterController.h"
#include "LinearMath/btTransform.h"
#include "OgrePageManager.h"
#include "Procedural.h"
@@ -269,7 +268,6 @@ class CharacterController : public OgreBites::InputListener,
// btRigidBody *mRigidBody;
btCompoundShape *mCollisionShape;
btPairCachingGhostObject *mGhostObject;
btKinematicCharacterController *mController;
public:
CharacterController(Ogre::SceneNode *camNode, Ogre::Camera *cam,
@@ -362,7 +360,6 @@ CharacterController::CharacterController(Ogre::SceneNode *camNode,
, world(world)
, mCollisionShape(nullptr)
, mGhostObject(nullptr)
, mController(nullptr)
{
setupBody();
setupCamera();

3
terrain.cpp
View File

@@ -8,7 +8,6 @@
#include "OgreApplicationContext.h"
#include "Bullet/OgreBullet.h"
#include "BulletCollision/CollisionDispatch/btGhostObject.h"
#include "btKinematicCharacterController.h"
#include "LinearMath/btTransform.h"
#include "OgrePageManager.h"
#include "lua_control.h"
@@ -235,7 +234,6 @@ class CharacterController : public OgreBites::InputListener, Ogre::FrameListener
// btRigidBody *mRigidBody;
btCompoundShape *mCollisionShape;
btPairCachingGhostObject *mGhostObject;
btKinematicCharacterController *mController;
public:
CharacterController(Ogre::SceneNode *camNode, Ogre::Camera *cam, Ogre::SceneManager *scnMgr, MainWorld *world);
~CharacterController();
@@ -322,7 +320,6 @@ CharacterController::CharacterController(
, world(world)
, mCollisionShape(nullptr)
, mGhostObject(nullptr)
, mController(nullptr)
{
setupBody();