diff --git a/Content/RNR/fonts/comic.ttf b/Content/RNR/fonts/ComicSans.ttf similarity index 100% rename from Content/RNR/fonts/comic.ttf rename to Content/RNR/fonts/ComicSans.ttf diff --git a/Content/RNR/fonts/Cube.mesh b/Content/RNR/fonts/Cube.mesh deleted file mode 100644 index 618fb9b..0000000 Binary files a/Content/RNR/fonts/Cube.mesh and /dev/null differ diff --git a/Content/RNR/fonts/Material.material b/Content/RNR/fonts/Material.material deleted file mode 100644 index 7bf8b4e..0000000 --- a/Content/RNR/fonts/Material.material +++ /dev/null @@ -1,16 +0,0 @@ -// generated by blender2ogre 0.8.3 on 2023-07-11 17:36:32 -material Material { - receive_shadows on - technique { - pass { - diffuse 0.8 0.8 0.8 1.0 - specular 0.512 0.512 0.512 1.0 64.0 - - texture_unit { - texture fonts/brick_tex.PNG - tex_address_mode wrap - colour_op modulate - } - } - } -} diff --git a/Content/RNR/fonts/brick_tex.PNG b/Content/RNR/fonts/brick_tex.PNG deleted file mode 100644 index 0b8a6c5..0000000 Binary files a/Content/RNR/fonts/brick_tex.PNG and /dev/null differ diff --git a/Content/RNR/materials/2008.material b/Content/RNR/materials/2008.material deleted file mode 100644 index 98f9855..0000000 --- a/Content/RNR/materials/2008.material +++ /dev/null @@ -1,137 +0,0 @@ -material sparkle/sparkleMatl -{ - technique - { - pass - { - lighting off - depth_write off - scene_blend add - - texture_unit - { - texture sparkle.png - colour_op modulate - } - } - } -} - -sparkle/sparkle1 -{ - quota 40 - material sparkle/sparkleMatl - particle_width 1 - particle_height 1 - cull_each false - renderer billboard - sorted false - local_space false - iteration_interval 0 - nonvisible_update_timeout 0 - billboard_type point - billboard_origin center - billboard_rotation_type vertex - common_up_vector 0 1 0 - point_rendering false - accurate_facing false - - emitter Point - { - angle 180 - colour 0.3 0.3 0.3 .6 - colour_range_start 0.25 0.25 0.25 1 - colour_range_end 0.5 0.5 0.5 1 - direction 0 -1 0 - emission_rate 160 - position 0 0 0 - velocity_min 5 - velocity_max 10 - duration .2 - time_to_live 1 - } - - affector Rotator - { - rotation_speed_range_end 360 - rotation_range_start 0 - rotation_range_end 360 - } - -} - -material explosion/explosionMatl -{ - technique - { - pass - { - lighting off - depth_write off - scene_blend add - - texture_unit - { - texture explosion.png - colour_op modulate - } - } - } -} - -explosion/explosion1 -{ - quota 400 - material explosion/explosionMatl - particle_width 5 - particle_height 5 - cull_each false - renderer billboard - sorted false - local_space false - iteration_interval 0 - nonvisible_update_timeout 0 - billboard_type point - billboard_origin center - billboard_rotation_type vertex - common_up_vector 0 1 0 - point_rendering false - accurate_facing false - - emitter Point - { - angle 180 - colour 0.3 0.3 0.3 .6 - colour_range_start 0.25 0.25 0.25 1 - colour_range_end 0.5 0.5 0.5 1 - direction 0 -1 0 - emission_rate 20000 - position 0 0 0 - velocity 30 - velocity_min 20 - velocity_max 30 - time_to_live 0.3 - time_to_live_min 0.25 - time_to_live_max 0.35 - duration 1.2 - duration_min 1.2 - duration_max 1.2 - repeat_delay 10000 - repeat_delay_min 10000 - repeat_delay_max 10000 - } - - affector DeflectorPlane - { - plane_point 0 0 0 - plane_normal 0 1 0 - bounce 0 - } - - affector DirectionRandomiser - { - randomness 0 - scope 1 - keep_velocity false - } -} \ No newline at end of file diff --git a/Content/RNR/fonts/BackMaterial.material b/Content/RNR/materials/BackMaterial.material similarity index 90% rename from Content/RNR/fonts/BackMaterial.material rename to Content/RNR/materials/BackMaterial.material index 69d9665..dbd65f9 100644 --- a/Content/RNR/fonts/BackMaterial.material +++ b/Content/RNR/materials/BackMaterial.material @@ -1,5 +1,5 @@ // generated by blender2ogre 0.8.3 on 2023-07-17 02:58:22 -material BackMaterial { +material materials/BackMaterial { receive_shadows on technique { pass { diff --git a/Content/RNR/fonts/BottomMaterial.material b/Content/RNR/materials/BottomMaterial.material similarity index 90% rename from Content/RNR/fonts/BottomMaterial.material rename to Content/RNR/materials/BottomMaterial.material index 608d795..e0f377c 100644 --- a/Content/RNR/fonts/BottomMaterial.material +++ b/Content/RNR/materials/BottomMaterial.material @@ -1,5 +1,5 @@ // generated by blender2ogre 0.8.3 on 2023-07-17 02:58:22 -material BottomMaterial { +material materials/BottomMaterial { receive_shadows on technique { pass { diff --git a/Content/RNR/fonts/FrontMaterial.material b/Content/RNR/materials/FrontMaterial.material similarity index 90% rename from Content/RNR/fonts/FrontMaterial.material rename to Content/RNR/materials/FrontMaterial.material index da97fcc..bc14cdc 100644 --- a/Content/RNR/fonts/FrontMaterial.material +++ b/Content/RNR/materials/FrontMaterial.material @@ -1,5 +1,5 @@ // generated by blender2ogre 0.8.3 on 2023-07-17 02:58:22 -material FrontMaterial { +material materials/FrontMaterial { receive_shadows on technique { pass { diff --git a/Content/RNR/fonts/LeftMaterial.material b/Content/RNR/materials/LeftMaterial.material similarity index 90% rename from Content/RNR/fonts/LeftMaterial.material rename to Content/RNR/materials/LeftMaterial.material index eefafd4..ab2fd8f 100644 --- a/Content/RNR/fonts/LeftMaterial.material +++ b/Content/RNR/materials/LeftMaterial.material @@ -1,5 +1,5 @@ // generated by blender2ogre 0.8.3 on 2023-07-17 02:58:22 -material LeftMaterial { +material materials/LeftMaterial { receive_shadows on technique { pass { diff --git a/Content/RNR/fonts/RightMaterial.material b/Content/RNR/materials/RightMaterial.material similarity index 90% rename from Content/RNR/fonts/RightMaterial.material rename to Content/RNR/materials/RightMaterial.material index a33bdad..6a9fdff 100644 --- a/Content/RNR/fonts/RightMaterial.material +++ b/Content/RNR/materials/RightMaterial.material @@ -1,5 +1,5 @@ // generated by blender2ogre 0.8.3 on 2023-07-17 02:58:22 -material RightMaterial { +material materials/RightMaterial { receive_shadows on technique { pass { diff --git a/Content/RNR/fonts/TopMaterial.material b/Content/RNR/materials/TopMaterial.material similarity index 91% rename from Content/RNR/fonts/TopMaterial.material rename to Content/RNR/materials/TopMaterial.material index 91b3370..d36aeac 100644 --- a/Content/RNR/fonts/TopMaterial.material +++ b/Content/RNR/materials/TopMaterial.material @@ -1,5 +1,5 @@ // generated by blender2ogre 0.8.3 on 2023-07-17 02:58:22 -material TopMaterial { +material materials/TopMaterial { receive_shadows on technique { pass { diff --git a/Content/RNR/materials/guibase3d.material b/Content/RNR/materials/guibase3d.material index 26b4b8c..4ae490c 100644 --- a/Content/RNR/materials/guibase3d.material +++ b/Content/RNR/materials/guibase3d.material @@ -1,4 +1,4 @@ -material materials/guibase3d +material materials/GuiBase3d { technique { diff --git a/Content/RNR/materials/partinstanced.material b/Content/RNR/materials/partinstanced.material index c74c162..ffd9e80 100644 --- a/Content/RNR/materials/partinstanced.material +++ b/Content/RNR/materials/partinstanced.material @@ -1,4 +1,4 @@ -material materials/partinstanced +material materials/PartInstanced { receive_shadows on diff --git a/Content/RNR/meshes/Cube.mesh b/Content/RNR/meshes/Cube.mesh new file mode 100644 index 0000000..d5d61b6 Binary files /dev/null and b/Content/RNR/meshes/Cube.mesh differ diff --git a/Content/RNR/fonts/part_mesh.mtl b/Content/RNR/meshes/Cube.mtl similarity index 93% rename from Content/RNR/fonts/part_mesh.mtl rename to Content/RNR/meshes/Cube.mtl index 2c63179..bc7d9c3 100644 --- a/Content/RNR/fonts/part_mesh.mtl +++ b/Content/RNR/meshes/Cube.mtl @@ -1,7 +1,7 @@ # Blender 3.5.1 MTL File: 'None' # www.blender.org -newmtl Material +newmtl Cube Ns 250.000000 Ka 1.000000 1.000000 1.000000 Kd 0.800000 0.800000 0.800000 diff --git a/Content/RNR/fonts/part_mesh.obj b/Content/RNR/meshes/Cube.obj similarity index 96% rename from Content/RNR/fonts/part_mesh.obj rename to Content/RNR/meshes/Cube.obj index 7ef1677..6456791 100644 --- a/Content/RNR/fonts/part_mesh.obj +++ b/Content/RNR/meshes/Cube.obj @@ -1,6 +1,6 @@ # Blender 3.5.1 # www.blender.org -mtllib part_mesh.mtl +mtllib Cube.mtl o FormFactor_Brick v 1.000000 1.000000 -1.000000 v 1.000000 -1.000000 -1.000000 @@ -31,7 +31,7 @@ vt 0.375000 1.000000 vt 0.375000 0.000000 vt 0.125000 0.750000 s 0 -usemtl Material +usemtl Cube f 1/1/1 5/5/1 7/9/1 3/3/1 f 4/4/2 3/3/2 7/10/2 8/12/2 f 8/13/3 7/11/3 5/6/3 6/8/3 diff --git a/Content/RNR/fonts/part_mesh.scene b/Content/RNR/meshes/Cube.scene similarity index 72% rename from Content/RNR/fonts/part_mesh.scene rename to Content/RNR/meshes/Cube.scene index 9f1cc37..23da0db 100644 --- a/Content/RNR/fonts/part_mesh.scene +++ b/Content/RNR/meshes/Cube.scene @@ -15,22 +15,22 @@ - + - + - + - + - + - + diff --git a/Content/RNR/textures/stud_top.png b/Content/RNR/textures/stud_top.png deleted file mode 100644 index 4909d66..0000000 Binary files a/Content/RNR/textures/stud_top.png and /dev/null differ diff --git a/Content/RNR/textures/surfaces.png b/Content/RNR/textures/surfaces.png deleted file mode 100644 index 2207cbd..0000000 Binary files a/Content/RNR/textures/surfaces.png and /dev/null differ diff --git a/Projects/Client/Common/Source/OgreWidget.cpp b/Projects/Client/Common/Source/OgreWidget.cpp index 8e4dbf2..7bf8338 100644 --- a/Projects/Client/Common/Source/OgreWidget.cpp +++ b/Projects/Client/Common/Source/OgreWidget.cpp @@ -93,7 +93,7 @@ namespace RNR Ogre::FontPtr pFont = Ogre::FontManager::getSingletonPtr()->create("ComicSans", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME); pFont->setType(Ogre::FT_TRUETYPE); - pFont->setSource("fonts/comic.ttf"); + pFont->setSource("fonts/ComicSans.ttf"); pFont->setTrueTypeSize(16); pFont->load(); diff --git a/Projects/Engine/Source/App/BrickColor.cpp b/Projects/Engine/Source/App/BrickColor.cpp index b8b3b4f..992f0c6 100644 --- a/Projects/Engine/Source/App/BrickColor.cpp +++ b/Projects/Engine/Source/App/BrickColor.cpp @@ -100,7 +100,7 @@ namespace RNR bc_prep = true; } - Ogre::MaterialPtr part_material = Ogre::MaterialManager::getSingletonPtr()->getByName("materials/partinstanced"); + Ogre::MaterialPtr part_material = Ogre::MaterialManager::getSingletonPtr()->getByName("materials/PartInstanced"); color_material = part_material->clone(Ogre::String("tmp_part/") + Ogre::StringConverter::toString(color_id)); Ogre::RTShader::ShaderGenerator::getSingletonPtr()->cloneShaderBasedTechniques(*part_material, *color_material); Ogre::Technique* mat_tech = color_material->getTechnique(0); diff --git a/Projects/Engine/Source/App/GUI/GuiBase3d.cpp b/Projects/Engine/Source/App/GUI/GuiBase3d.cpp index 294d089..9a2ae7c 100644 --- a/Projects/Engine/Source/App/GUI/GuiBase3d.cpp +++ b/Projects/Engine/Source/App/GUI/GuiBase3d.cpp @@ -8,6 +8,6 @@ namespace RNR m_transparency = 0.f; m_visible = true; - m_material = Ogre::MaterialManager::getSingletonPtr()->getByName("materials/guibase3d"); + m_material = Ogre::MaterialManager::getSingletonPtr()->getByName("materials/GuiBase3d"); } } diff --git a/Projects/Engine/Source/App/V8/DataModel/PartInstance.cpp b/Projects/Engine/Source/App/V8/DataModel/PartInstance.cpp index 7167f15..f85de2b 100644 --- a/Projects/Engine/Source/App/V8/DataModel/PartInstance.cpp +++ b/Projects/Engine/Source/App/V8/DataModel/PartInstance.cpp @@ -13,7 +13,7 @@ namespace RNR m_reflectance = 0.0; setNode(world->getOgreSceneManager()->getRootSceneNode()->createChildSceneNode()); - setObject(world->getOgreSceneManager()->createEntity("fonts/Cube.mesh")); + setObject(world->getOgreSceneManager()->createEntity("meshes/cube.mesh")); getNode()->attachObject(getObject()); updateMatrix(); diff --git a/Projects/Engine/Source/App/V8/DataModel/Workspace.cpp b/Projects/Engine/Source/App/V8/DataModel/Workspace.cpp index bbbdd2d..df38a78 100644 --- a/Projects/Engine/Source/App/V8/DataModel/Workspace.cpp +++ b/Projects/Engine/Source/App/V8/DataModel/Workspace.cpp @@ -38,7 +38,7 @@ namespace RNR case BATCH_INSTANCED: { Ogre::Entity* childEntity = (Ogre::Entity*)childAdded->getObject(); - Ogre::InstancedEntity* replica = m_instanceManager->createInstancedEntity("materials/partinstanced"); + Ogre::InstancedEntity* replica = m_instanceManager->createInstancedEntity("materials/PartInstanced"); replica->setPosition(part->getPosition()); replica->setOrientation(part->getCFrame().getRotation()); replica->setScale(part->getSize());