Skip to content

Commit

Permalink
Assignment1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
christt105 committed Oct 26, 2019
1 parent 9ace7ff commit 518e2a0
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 6 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## [Assignment1.2] - 26/10/2019
### Added
- Can deselect GameObjects clicking in hierarchy window
- All panels can be access in Windows menu bar
- Brofiler

### Fixed
- Dt code
- Can Focus on an object without need to move mouse to scene panel
- #11
- Drag and drop of pictures (png and jpg)

## [Assignment1.1] - 26/10/2019
### Added
- Drag and Drop GameObjects in hierarchy
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# 3D Game Engine: WhispEngine

## Current Version
v Assignment1.1
v Assignment1.2

## Description
This is a 3D Game Engine made by Students at CITM (UPC) from Spain.
Expand Down Expand Up @@ -44,9 +44,9 @@ Extract .zip files inside a folder and open the .exe file.
* Shortcut system
* Drag and Drop Game objects inside/outside other objects to transform parents and children
* Create an empty Game object with right click in hierarchy and delete it
* Transform logic created and working! (but commented PushMatrix in code at the request of the teacher)
* Transform logic created and working! (commented in code for assignment1)
* Add component
* Outline meshes using StencilBuffer (blue to children objs, yellow to parent objs)
* Outline meshes using StencilBuffer (blue to children objs, orange to parent objs)
* Viewport options to configure all Engine Speeds in Configuration panel
* (?)Info - Help markers
* Change mouse icon when click middle mouse button
Expand Down
Binary file modified WhispEngine/Game/Assets/Models/BakerHouse.fbx
Binary file not shown.
Binary file removed WhispEngine/Game/Assets/Models/Dragon.FBX
Binary file not shown.
3 changes: 3 additions & 0 deletions WhispEngine/WhispEngine/GameObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ GameObject::~GameObject()
*i = nullptr;
}
children.clear();

if (this == App->object_manager->GetSelected())
App->object_manager->SetSelected(nullptr);
}

void GameObject::Update()
Expand Down
1 change: 1 addition & 0 deletions WhispEngine/WhispEngine/ModuleImport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ bool ModuleImport::ImportFbx(const char * path)

if (scene != nullptr && scene->HasMeshes())
{
App->object_manager->SetSelected(nullptr);
uint ticks = SDL_GetTicks(); //timer
PerfTimer timer;

Expand Down
3 changes: 0 additions & 3 deletions WhispEngine/WhispEngine/ModuleObjectManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ GameObject * ModuleObjectManager::CreateGameObject(GameObject * parent)

void ModuleObjectManager::DestroyGameObject(GameObject * obj)
{
if (obj == selected)
selected = nullptr;

obj->parent->children.erase(std::find(obj->parent->children.begin(), obj->parent->children.end(), obj));
delete obj;
}
Expand Down

0 comments on commit 518e2a0

Please sign in to comment.