Skip to content

Commit

Permalink
Entity/Render update...
Browse files Browse the repository at this point in the history
Added entities and an entity manager
Added interaction system
Added a model manager (use it instead of ObjLoader.java)
You must use VAOManager to create a VAO
(!WIP!) Added an animated object loader
(!WIP!) Added GUI Loader

Shaders are now in their respective path
TextureDef now require a type (to load the good default texture if not found)
VRUtils FBOs are now loaded in Deferred render


Fixed game speed
Added Shadows and Bloom to deferred render
Edited SGE title screen
Added a way to get source name in AudioSource.java


Renamed Pointlight.java to Ent_PointLight.java
Renamed world3d.loader.PointLight.java to entities.Entity.java
Renamed utils.VOLoader.java to models.utils.VaoManager.java


Added render methods to WorldLoader.java (3d)
Added renderVR(int eye) to DeferredModelRenderer.java
RenderableModel now have renderToScreen() instead of renderFree() and renderModern()
RenderableModel now have renderVREye(int eye) instead of renderVREye()
Removed an useless part of the code in DisplayManager
Added quatToMatrix(Quat4f q, Matrix4f mat) to MatrixUtils.java
Added nearest and nearest dragable entity search to RaycastUtil.java






Added localizationUtils to libraries
Added RUDP to libraries
Added some base models
Added some base mono musics
Added some base textures
Added some base entities (!WIP!)


Configuration.java:
- Removed free render method (now VBO only)
- Removed texture-sorting render
- Added defferedRender list keeper
- Added entities autoupdate option
- Added 3d Hand render option (for weapons)
- Added Timing debug option
- Added a way to disable GUI update and render
- Added default configuration loads (VR / 3D RPG / 3D FPS)
- Added Lights znear - zfar parameter
  • Loading branch information
Slaynash committed Nov 11, 2017
1 parent 6ee72a4 commit f4c8062
Show file tree
Hide file tree
Showing 214 changed files with 20,962 additions and 1,983 deletions.
1 change: 1 addition & 0 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
<classpathentry kind="lib" path="libs/audio/CodecWav.jar"/>
<classpathentry kind="lib" path="libs/physics/jbox2d_sge_edition_0808171240.jar"/>
<classpathentry kind="lib" path="libs/jamepad_sge_edition_2607171819.jar"/>
<classpathentry kind="lib" path="libs/localizationUtils_1792f78.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Binary file modified bin/slaynash/sgengine/Configuration$1.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/Configuration.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/SGELabelPage.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/audio/AudioSource.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/gui/GUIFrame.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/gui/GUIImage.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/gui/GUIManager$1.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/gui/GUIManager.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/gui/GUIMiniPopup.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/gui/GUIPopup.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/gui/button/GUIButton.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/gui/checkBox/GUICheckBox.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/gui/comboBox/GUIComboBox.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/gui/slider/GUISlider.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/gui/text2d/Text2d.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/gui/textField/GUITextField.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/models/Renderable2dModel.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/models/Renderable3dModel.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/models/RenderableModel.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/objloader/ObjLoader.class
Binary file not shown.
Binary file removed bin/slaynash/sgengine/shaders/FreeShader.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/shaders/ModernShader3D.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/shaders/ModernShaderGUI.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/shaders/ModernShaderLabel.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/shaders/ModernShaderVR.class
Binary file not shown.
Binary file removed bin/slaynash/sgengine/shaders/Shader3D.class
Binary file not shown.
Binary file removed bin/slaynash/sgengine/shaders/ShaderGUI.class
Binary file not shown.
Binary file removed bin/slaynash/sgengine/shaders/ShaderLabel.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/shaders/ShaderManager.class
Binary file not shown.
Binary file removed bin/slaynash/sgengine/shaders/ShaderVR.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/textureUtils/TextureDef.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/textureUtils/TextureManager.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/utils/DisplayManager.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/utils/MatrixUtils.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/utils/PageManager$1.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/utils/PageManager.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/utils/RaycastUtil.class
Binary file not shown.
Binary file removed bin/slaynash/sgengine/utils/VAO.class
Binary file not shown.
Binary file removed bin/slaynash/sgengine/utils/VOLoader.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/utils/VRUtils.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/world3d/CollisionManager3d$1.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/world3d/CollisionManager3d.class
Binary file not shown.
Binary file modified bin/slaynash/sgengine/world3d/entities/dev/EntityTurretTest.class
Binary file not shown.
Binary file removed bin/slaynash/sgengine/world3d/loader/Entity.class
Binary file not shown.
Binary file not shown.
Binary file modified bin/slaynash/sgengine/world3d/loader/WorldLoader.class
Binary file not shown.
Binary file added libs/localizationUtils_1792f78.jar
Binary file not shown.
Binary file added libs/multiplayer/rudpLib-b9a25a4.jar
Binary file not shown.
12 changes: 12 additions & 0 deletions res/models/ERROR.mtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Blender MTL File: 'None'
# Material Count: 1

newmtl None
Ns 0.000000
Ka 0.000000 0.000000 0.000000
Kd 0.800000 0.800000 0.800000
Ks 0.800000 0.800000 0.800000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
Loading

0 comments on commit f4c8062

Please sign in to comment.