Skip to content

Commit

Permalink
Merge branch 'ImGui'
Browse files Browse the repository at this point in the history
  • Loading branch information
Dani-24 committed Nov 1, 2022
2 parents 2b642d8 + 1017d68 commit f22b16d
Show file tree
Hide file tree
Showing 522 changed files with 138,155 additions and 4,124 deletions.
53 changes: 52 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# User-specific files
*.rsuser
*.suo
*.user
.user
*.userosscache
*.sln.docstates

Expand Down Expand Up @@ -348,3 +348,54 @@ MigrationBackup/

# Ionide (cross platform F# VS Code tools) working folder
.ionide/
ToasterEngine-Code/Engine_Output/imgui.ini
ToasterEngine-Code/Debug Citm/vc142.idb
ToasterEngine-Code/Debug Citm/ToasterEngine-v2.res
ToasterEngine-Code/Debug Citm/Toaster.tlog/Toaster.lastbuildstate
ToasterEngine-Code/Debug Citm/Toaster.tlog/rc.write.1.tlog
ToasterEngine-Code/Debug Citm/Toaster.tlog/rc.read.1.tlog
ToasterEngine-Code/Debug Citm/Toaster.tlog/rc.command.1.tlog
ToasterEngine-Code/Debug Citm/Toaster.tlog/link.write.1.tlog
ToasterEngine-Code/Debug Citm/Toaster.tlog/link.read.1.tlog
ToasterEngine-Code/Debug Citm/Toaster.tlog/link.command.1.tlog
ToasterEngine-Code/Debug Citm/Toaster.tlog/CL.write.1.tlog
ToasterEngine-Code/Debug Citm/Toaster.tlog/CL.read.1.tlog
ToasterEngine-Code/Debug Citm/Toaster.tlog/CL.command.1.tlog
ToasterEngine-Code/Debug Citm/Toaster Engine /Engine_Output.exe.recipe
ToasterEngine-Code/Debug Citm/Toaster Engine /Engine_Output.exe
ToasterEngine-Code/Debug Citm/Toaster Engine ඞ.vcxproj.FileListAbsolute.txt
ToasterEngine-Code/Toaster/vc142.idb
ToasterEngine-Code/Toaster/ToasterEngine-v2.res
ToasterEngine-Code/Toaster/Toaster.tlog/Toaster.lastbuildstate
ToasterEngine-Code/Toaster/Toaster.tlog/rc.write.1.tlog
ToasterEngine-Code/Toaster/Toaster.tlog/rc.read.1.tlog
ToasterEngine-Code/Toaster/Toaster.tlog/rc.command.1.tlog
ToasterEngine-Code/Toaster/Toaster.tlog/link.write.1.tlog
ToasterEngine-Code/Toaster/Toaster.tlog/link.read.1.tlog
ToasterEngine-Code/Toaster/Toaster.tlog/link.command.1.tlog
ToasterEngine-Code/Toaster/Toaster.tlog/CL.write.1.tlog
ToasterEngine-Code/Toaster/Toaster.tlog/CL.read.1.tlog
ToasterEngine-Code/Toaster/Toaster.tlog/CL.command.1.tlog
ToasterEngine-Code/Toaster/Toaster Engine /Engine_Output.exe.recipe
ToasterEngine-Code/Toaster/Toaster Engine /Engine_Output.exe
ToasterEngine-Code/Toaster/Toaster Engine ඞ.vcxproj.FileListAbsolute.txt
ToasterEngine-Code/Debug Citm/Toaster.tlog/unsuccessfulbuild
ToasterEngine-Code/Engine_Output/imgui.ini
ToasterEngine-Code/Toaster/Toaster.tlog/unsuccessfulbuild
ToasterEngine-Code/Builds/Toaster/vc142.idb
ToasterEngine-Code/Builds/Toaster/ToasterEngine-v2.res
ToasterEngine-Code/Builds/Toaster/Toaster.tlog/Toaster.lastbuildstate
ToasterEngine-Code/Builds/Toaster/Toaster.tlog/rc.write.1.tlog
ToasterEngine-Code/Builds/Toaster/Toaster.tlog/rc.read.1.tlog
ToasterEngine-Code/Builds/Toaster/Toaster.tlog/rc.command.1.tlog
ToasterEngine-Code/Builds/Toaster/Toaster.tlog/link.write.1.tlog
ToasterEngine-Code/Builds/Toaster/Toaster.tlog/link.read.1.tlog
ToasterEngine-Code/Builds/Toaster/Toaster.tlog/link.command.1.tlog
ToasterEngine-Code/Builds/Toaster/Toaster.tlog/CL.write.1.tlog
ToasterEngine-Code/Builds/Toaster/Toaster.tlog/CL.read.1.tlog
ToasterEngine-Code/Builds/Toaster/Toaster.tlog/CL.command.1.tlog
ToasterEngine-Code/Builds/Toaster/Toaster Engine /Engine_Output.exe.recipe
ToasterEngine-Code/Builds/Toaster/Toaster Engine /Engine_Output.exe
ToasterEngine-Code/Builds/Toaster/Toaster Engine ඞ.vcxproj.FileListAbsolute.txt
ToasterEngine-Code/Engine_Output/imgui.ini
ToasterEngine-Code/Builds/Toaster/Toaster.tlog/unsuccessfulbuild
72 changes: 71 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,72 @@
# Engine
# Toaster Engine
![image](https://user-images.githubusercontent.com/79161140/192161224-a374e6b4-c0f1-47d2-9202-6a044b5bb32f.png)

## Information

Thanks for downloading [Toaster Engine](https://github.com/Dani-24/Toaster_Engine). As the name implies, this engine is like a toaster so it does it job perfect but it can't do physical toast sadly.

This thing has been developed by Dani Toledo , aka [Dani24](https://github.com/Dani-24)

## How to use this toaster

1 - Download the lastest release

2 - Unzip the release

3 - Open the unzipped folder and look for the .exe file

4 - Cook your computer for 4 minutes

5 - Enjoy!

### Controls

Just use the mouse!

Any specific shortcut is shown at the engine UI.

### Camera

* Movement : WASD + Right Click

* Rotation : Alt + Left Click

* Zoom : Mouse Wheel

## FAQ

Q) What Can I do to zoom the camera if I don't have a mouse wheel?

A) Why are you using a laptop!? Useless piece of human, buy a mouse and a normal computer!

Q) Camera controls are so uncomfortable & annoying, can i edit them?

A) No, because i have a pdf with rules that says that this are the controls, but you can disable the Right Click for movement & the Alt for rotation by going to Window->Disable psycopath camera controls.

Q) Why is this Engine the best one around the world?

A) Toaster Engine, your best option when doing a toasty game :D

## 3rd Party Software

[SDL2](https://www.libsdl.org)

[OpenGL](https://www.opengl.org)

[Glew](https://glew.sourceforge.net)

[Assimp](https://github.com/assimp/assimp)

[ImGui](https://github.com/ocornut/imgui)

[Parson](https://github.com/kgabis/parson)

[PhysFS](https://icculus.org/physfs/)

[Mmgr](https://github.com/RIscRIpt/mmgr), or also obviously known as [Mar Menor Golf Resort](https://www.mmgr.info/es/)

[GPUDetector](https://www.intel.es/content/www/es/es/homepage.html)

[DevIL](https://openil.sourceforge.net)

## [Licence](https://github.com/Dani-24/Toaster_Engine/blob/main/LICENSE)
134 changes: 0 additions & 134 deletions ToasterEngine-Code/Application.cpp

This file was deleted.

Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ToasterEngine-Code/Engine_Output/DevIL.dll
Binary file not shown.
Binary file added ToasterEngine-Code/Engine_Output/ILU.dll
Binary file not shown.
Binary file added ToasterEngine-Code/Engine_Output/ILUT.dll
Binary file not shown.
Binary file modified ToasterEngine-Code/Engine_Output/SDL2.dll
Binary file not shown.
Binary file added ToasterEngine-Code/Engine_Output/assimp.dll
Binary file not shown.
Binary file added ToasterEngine-Code/Engine_Output/glew32.dll
Binary file not shown.
Binary file removed ToasterEngine-Code/Engine_Output/glut32.dll
Binary file not shown.
Loading

0 comments on commit f22b16d

Please sign in to comment.