]> git.leopard-lacewing.eu Git - cgue_weave.git/log
cgue_weave.git
10 years agoBulllet Collision working
Peter Schaefer [Tue, 9 Jun 2015 06:49:03 +0000 (08:49 +0200)]
Bulllet Collision working

10 years agomoved modelMat from IMesh to IMetaMesh
Peter Schaefer [Thu, 4 Jun 2015 07:35:57 +0000 (09:35 +0200)]
moved modelMat from IMesh to IMetaMesh

10 years agosplit scaling and transformation
Peter Schaefer [Thu, 4 Jun 2015 06:51:32 +0000 (08:51 +0200)]
split scaling and transformation

10 years agomerged Time
Peter Schaefer [Wed, 3 Jun 2015 12:31:04 +0000 (14:31 +0200)]
merged Time

10 years agofixed collide Calls
Peter Schaefer [Wed, 3 Jun 2015 10:48:05 +0000 (12:48 +0200)]
fixed collide Calls
removed Scaling from modelMat

10 years agoy_speed is saved in timestamps
LockedLunatic [Tue, 2 Jun 2015 03:59:53 +0000 (05:59 +0200)]
y_speed is saved in timestamps

10 years agoadded collideGroups
Peter Schaefer [Mon, 1 Jun 2015 23:30:34 +0000 (01:30 +0200)]
added collideGroups
looks like Transform dont work

10 years agocreating btShapes (not Tested)
Peter Schaefer [Mon, 1 Jun 2015 12:25:21 +0000 (14:25 +0200)]
creating btShapes (not Tested)

10 years agocreation of Bullet objects in Scene,SceneObject,Model
Peter Schaefer [Mon, 1 Jun 2015 10:48:09 +0000 (12:48 +0200)]
creation of Bullet objects in Scene,SceneObject,Model

10 years agoadded Bullet
Peter Schaefer [Fri, 29 May 2015 09:25:25 +0000 (11:25 +0200)]
added Bullet
preconfigured Project to compile correctly

10 years agodeactivated meshTree
Peter Schaefer [Fri, 29 May 2015 09:03:14 +0000 (11:03 +0200)]
deactivated meshTree

10 years agoMerge branch 'master' of lva.cg.tuwien.ac.at:Weave
Peter Schaefer [Wed, 27 May 2015 09:32:40 +0000 (11:32 +0200)]
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave

10 years agobug fix
LockedLunatic [Wed, 27 May 2015 09:31:57 +0000 (11:31 +0200)]
bug fix

10 years agoMerge branch 'master' of lva.cg.tuwien.ac.at:Weave
Peter Schaefer [Wed, 27 May 2015 09:24:21 +0000 (11:24 +0200)]
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave

10 years agorewinding time semi-functions
LockedLunatic [Wed, 27 May 2015 09:22:20 +0000 (11:22 +0200)]
rewinding time semi-functions

10 years agoadded SplitMat to reduce inversions and splitting
Peter Schaefer [Mon, 25 May 2015 19:43:08 +0000 (21:43 +0200)]
added SplitMat to reduce inversions and splitting

10 years agotriangle check (not working)
Peter Schaefer [Wed, 20 May 2015 11:00:04 +0000 (13:00 +0200)]
triangle check (not working)
colDetect to slow

10 years agoreplaced center&size with box
Peter Schaefer [Wed, 20 May 2015 00:37:14 +0000 (02:37 +0200)]
replaced center&size with box

10 years agofinished Box class
Peter Schaefer [Tue, 19 May 2015 23:11:09 +0000 (01:11 +0200)]
finished Box class
marked old centerSize as deprecated

10 years agofixed wrong BBox center and size bug (Box class)
Peter Schaefer [Tue, 19 May 2015 16:52:26 +0000 (18:52 +0200)]
fixed wrong BBox center and size bug (Box class)

10 years agoimplemented SubBBox Check -> (one way)
Peter Schaefer [Tue, 19 May 2015 13:41:57 +0000 (15:41 +0200)]
implemented SubBBox Check -> (one way)
changed to size/center to Box Class

10 years agoBBMeshTrees are drawable now (but be carefull with deepLVL)
Peter Schaefer [Sat, 16 May 2015 15:43:04 +0000 (17:43 +0200)]
BBMeshTrees are drawable now (but be carefull with deepLVL)

10 years agofixed transp in Shader
Peter Schaefer [Sat, 16 May 2015 14:54:42 +0000 (16:54 +0200)]
fixed transp in Shader
edited SkyTexture

10 years agotransparency enabled
LockedLunatic [Wed, 13 May 2015 14:33:44 +0000 (16:33 +0200)]
transparency enabled

10 years agoskybox set to png
LockedLunatic [Wed, 13 May 2015 12:59:43 +0000 (14:59 +0200)]
skybox set to png

10 years agoMerge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
LockedLunatic [Wed, 13 May 2015 12:28:39 +0000 (14:28 +0200)]
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave

10 years agozips not tracked anymore
LockedLunatic [Wed, 13 May 2015 12:28:31 +0000 (14:28 +0200)]
zips not tracked anymore

10 years agofixed build MeshTree (but is very slow)
Peter Schaefer [Tue, 12 May 2015 22:19:19 +0000 (00:19 +0200)]
fixed build MeshTree (but is very slow)
new SkyBox

10 years agobuilds mesh tree (disabled,because of some exeptions)
Peter Schaefer [Tue, 12 May 2015 09:39:47 +0000 (11:39 +0200)]
builds mesh tree (disabled,because of some exeptions)

10 years agoremoved BBoxTree
Peter Schaefer [Mon, 11 May 2015 19:20:53 +0000 (21:20 +0200)]
removed BBoxTree

10 years agomoved Overlap to own file
Peter Schaefer [Mon, 11 May 2015 18:22:21 +0000 (20:22 +0200)]
moved Overlap to own file
new BBoxTree
moved GLM out of Graphix

10 years agomerged & changed lights Lighting
Peter Schaefer [Sat, 9 May 2015 23:59:38 +0000 (01:59 +0200)]
merged & changed lights

10 years agolighting is DONE!!
LockedLunatic [Sat, 9 May 2015 23:46:34 +0000 (01:46 +0200)]
lighting is DONE!!

10 years agoMerge branch 'Lighting' of git-cgue@lva.cg.tuwien.ac.at:Weave
LockedLunatic [Sat, 9 May 2015 23:17:06 +0000 (01:17 +0200)]
Merge branch 'Lighting' of git-cgue@lva.cg.tuwien.ac.at:Weave

Conflicts:
shader/basicTexture_VS.hlsl
shader/lightingTexture_FS.hlsl

10 years agoshader stuff
LockedLunatic [Sat, 9 May 2015 23:16:07 +0000 (01:16 +0200)]
shader stuff

10 years agofixed it?
Peter Schaefer [Sat, 9 May 2015 23:15:28 +0000 (01:15 +0200)]
fixed it?

10 years agoMerge branch 'Lighting' of git-cgue@lva.cg.tuwien.ac.at:Weave
LockedLunatic [Sat, 9 May 2015 23:01:15 +0000 (01:01 +0200)]
Merge branch 'Lighting' of git-cgue@lva.cg.tuwien.ac.at:Weave

Conflicts:
shader/lightingTexture_FS.hlsl

10 years agoback to eye positions
Peter Schaefer [Sat, 9 May 2015 23:00:30 +0000 (01:00 +0200)]
back to eye positions

10 years agoMerge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
LockedLunatic [Sat, 9 May 2015 21:39:01 +0000 (23:39 +0200)]
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave

Conflicts:
shader/basicTexture_VS.hlsl

10 years agoMerge branch 'master' into Lighting
LockedLunatic [Sat, 9 May 2015 21:33:30 +0000 (23:33 +0200)]
Merge branch 'master' into Lighting

Conflicts:
shader/basicTexture_VS.hlsl

10 years agofixed Normals in VS
Peter Schaefer [Sat, 9 May 2015 21:32:03 +0000 (23:32 +0200)]
fixed Normals in VS

10 years agoshader is a bit better
LockedLunatic [Sat, 9 May 2015 21:26:34 +0000 (23:26 +0200)]
shader is a bit better

10 years agoMerge branch 'Lighting' of lva.cg.tuwien.ac.at:Weave
Peter Schaefer [Sat, 9 May 2015 20:25:47 +0000 (22:25 +0200)]
Merge branch 'Lighting' of lva.cg.tuwien.ac.at:Weave

10 years agomid shader change
LockedLunatic [Sat, 9 May 2015 20:22:34 +0000 (22:22 +0200)]
mid shader change

10 years agomid shader change
LockedLunatic [Sat, 9 May 2015 19:41:35 +0000 (21:41 +0200)]
mid shader change

10 years agofixed new/delete for textures
Peter Schaefer [Sat, 9 May 2015 11:53:58 +0000 (13:53 +0200)]
fixed new/delete for textures
removed badhack for textures

10 years agomid shader change
LockedLunatic [Sat, 9 May 2015 00:24:59 +0000 (02:24 +0200)]
mid shader change

10 years agoMerge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
LockedLunatic [Thu, 7 May 2015 12:29:20 +0000 (14:29 +0200)]
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave

10 years agomid shader change
LockedLunatic [Thu, 7 May 2015 12:29:12 +0000 (14:29 +0200)]
mid shader change

10 years agofirst cleanup for collides
Peter Schaefer [Thu, 7 May 2015 10:44:58 +0000 (12:44 +0200)]
first cleanup for collides

10 years agosaving loaded meshes
Peter Schaefer [Thu, 7 May 2015 09:34:34 +0000 (11:34 +0200)]
saving loaded meshes
collision on SubBBox works :)
new class Overlap (overlap, inside and vec and shortest direction)
Overlap (shortest direction doesnt work)

10 years agoMerge branch 'master' of lva.cg.tuwien.ac.at:Weave
Peter Schaefer [Wed, 6 May 2015 15:47:45 +0000 (17:47 +0200)]
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave

10 years agofix for IMetaMesh modelpath
Peter Schaefer [Wed, 6 May 2015 15:47:29 +0000 (17:47 +0200)]
fix for IMetaMesh modelpath
fix deleteModel works now

10 years agoredesigned new/delete for models
Peter Schaefer [Wed, 6 May 2015 15:31:47 +0000 (17:31 +0200)]
redesigned new/delete for models
added colors for BBox

10 years agowinrar.bat added to ignore
LockedLunatic [Mon, 4 May 2015 22:21:32 +0000 (00:21 +0200)]
winrar.bat added to ignore

10 years agoupdated FileStructure
Peter Schaefer [Mon, 4 May 2015 21:20:47 +0000 (23:20 +0200)]
updated FileStructure
updated winrar.bat

10 years agoupdated Submission1.zip
Peter Schaefer [Mon, 4 May 2015 21:13:07 +0000 (23:13 +0200)]
updated Submission1.zip

10 years agoMerge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
LockedLunatic [Mon, 4 May 2015 21:11:14 +0000 (23:11 +0200)]
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave

10 years agodocument updated
LockedLunatic [Mon, 4 May 2015 21:11:00 +0000 (23:11 +0200)]
document updated

10 years agofixed winrar.bat
Peter Schaefer [Mon, 4 May 2015 21:01:19 +0000 (23:01 +0200)]
fixed winrar.bat

10 years agoadded SUB1.zip
Peter Schaefer [Mon, 4 May 2015 20:53:13 +0000 (22:53 +0200)]
added SUB1.zip

10 years agoadded 2 Zonen
Peter Schaefer [Mon, 4 May 2015 20:46:36 +0000 (22:46 +0200)]
added 2 Zonen

10 years agoremoved BadHack but dont load one Texture twice
Peter Schaefer [Mon, 4 May 2015 20:37:34 +0000 (22:37 +0200)]
removed BadHack but dont load one Texture twice

10 years agobadHack Textures!!!
Peter Schaefer [Mon, 4 May 2015 20:29:32 +0000 (22:29 +0200)]
badHack Textures!!!

10 years agorestart Game
Peter Schaefer [Mon, 4 May 2015 20:17:02 +0000 (22:17 +0200)]
restart Game
fixed Level Texture

10 years agolight changed
LockedLunatic [Mon, 4 May 2015 19:51:42 +0000 (21:51 +0200)]
light changed

10 years agoworld is smooth
LockedLunatic [Mon, 4 May 2015 19:48:31 +0000 (21:48 +0200)]
world is smooth

10 years agoplayer is flat again
LockedLunatic [Mon, 4 May 2015 19:40:33 +0000 (21:40 +0200)]
player is flat again

10 years agoplayer is smooth
LockedLunatic [Mon, 4 May 2015 19:22:00 +0000 (21:22 +0200)]
player is smooth

10 years agodoc updated and level meshes smoothed
LockedLunatic [Mon, 4 May 2015 19:11:19 +0000 (21:11 +0200)]
doc updated and level meshes smoothed

10 years agodoc updated
LockedLunatic [Mon, 4 May 2015 18:43:23 +0000 (20:43 +0200)]
doc updated

10 years agoMerge branch 'master' of lva.cg.tuwien.ac.at:Weave
Peter Schaefer [Mon, 4 May 2015 18:12:21 +0000 (20:12 +0200)]
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave

10 years agofixed BBox collide Bug (Scale Position&Size)
Peter Schaefer [Mon, 4 May 2015 18:11:18 +0000 (20:11 +0200)]
fixed BBox collide Bug (Scale Position&Size)
size saves now half size

10 years agodocumentation for 1st submission
LockedLunatic [Mon, 4 May 2015 16:41:15 +0000 (18:41 +0200)]
documentation for 1st submission

10 years agoupdated EventBox
Peter Schaefer [Sun, 3 May 2015 21:50:03 +0000 (23:50 +0200)]
updated EventBox
updated Colliding concept (SCENE)
broken Colliding concept (MODEL) outer BBox working only

10 years agoremoved scale from Model (scale with mat4)
Peter Schaefer [Sun, 3 May 2015 20:02:53 +0000 (22:02 +0200)]
removed scale from Model (scale with mat4)

10 years agonew function removeNormalize
Peter Schaefer [Sun, 3 May 2015 19:47:35 +0000 (21:47 +0200)]
new function removeNormalize
new Scene HEADER
new EventBox

10 years agomaterial moved to texture
LockedLunatic [Sat, 2 May 2015 23:31:31 +0000 (01:31 +0200)]
material moved to texture

10 years agofixed BBox Kollision (real BBox distance!)
Peter Schaefer [Sat, 2 May 2015 08:29:02 +0000 (10:29 +0200)]
fixed BBox Kollision (real BBox distance!)

10 years agomoved Scale to Model
Peter Schaefer [Sat, 2 May 2015 08:06:13 +0000 (10:06 +0200)]
moved Scale to Model
rewrite BBox Kollide

10 years agocleanup in Game.cpp
Peter Schaefer [Thu, 30 Apr 2015 12:34:59 +0000 (14:34 +0200)]
cleanup in Game.cpp
BBox kollisionen passen fürs erste (können Aber noch optimiert werden)

10 years agoimproved rotation Colliding (not final but works)
Peter Schaefer [Thu, 30 Apr 2015 08:24:26 +0000 (10:24 +0200)]
improved rotation Colliding (not final but works)

10 years agofixed missing modelMat in Collision
Peter Schaefer [Wed, 29 Apr 2015 19:44:42 +0000 (21:44 +0200)]
fixed missing modelMat in Collision

10 years agomoved collision to Model
Peter Schaefer [Wed, 29 Apr 2015 10:22:13 +0000 (12:22 +0200)]
moved collision to Model

10 years agoadded collision detection on outer BBox
Peter Schaefer [Wed, 29 Apr 2015 08:35:41 +0000 (10:35 +0200)]
added collision detection on outer BBox
isOverlapping & isInside

10 years agolevel UVs fixed
LockedLunatic [Tue, 28 Apr 2015 15:03:11 +0000 (17:03 +0200)]
level UVs fixed

10 years agomaterials added
LockedLunatic [Tue, 28 Apr 2015 14:25:59 +0000 (16:25 +0200)]
materials added

10 years agonew SceneObjects (Sky, Marvin)
Peter Schaefer [Tue, 28 Apr 2015 11:20:11 +0000 (13:20 +0200)]
new SceneObjects (Sky, Marvin)
fixed BBox Texture Bug?
refactor SceneConcept

10 years agomoved Scene to own directiory
Peter Schaefer [Mon, 27 Apr 2015 10:27:59 +0000 (12:27 +0200)]
moved Scene to own directiory

10 years agodrawabl.h removed
LockedLunatic [Mon, 27 Apr 2015 00:11:56 +0000 (02:11 +0200)]
drawabl.h removed

10 years agoremoved Drawable
Peter Schaefer [Sun, 26 Apr 2015 18:55:30 +0000 (20:55 +0200)]
removed Drawable
removed unused classes

10 years agonew levelTexture (!Bug with the UV's)
Peter Schaefer [Sun, 26 Apr 2015 18:27:27 +0000 (20:27 +0200)]
new levelTexture (!Bug with the UV's)
minor fixes

10 years agorebuild Assimp because of lib->exe bug from assimp
Peter Schaefer [Sun, 26 Apr 2015 16:39:05 +0000 (18:39 +0200)]
rebuild Assimp because of lib->exe bug from assimp

10 years agofixed double Jump Bug (press Jump in 2 following Frames (mouse,leer))
Peter Schaefer [Sun, 26 Apr 2015 15:11:05 +0000 (17:11 +0200)]
fixed double Jump Bug (press Jump in 2 following Frames (mouse,leer))

10 years agofixed useless inversion of projection per Vertex
Peter Schaefer [Sun, 26 Apr 2015 14:38:37 +0000 (16:38 +0200)]
fixed useless inversion of projection per Vertex

10 years agofixed BBox size and position
Peter Schaefer [Sun, 26 Apr 2015 14:24:42 +0000 (16:24 +0200)]
fixed BBox size and position

10 years agopoint light moved
LockedLunatic [Sun, 26 Apr 2015 01:19:27 +0000 (03:19 +0200)]
point light moved

10 years agofixed transform dataType
Peter Schaefer [Sat, 25 Apr 2015 17:16:04 +0000 (19:16 +0200)]
fixed transform dataType
moved modelMat to IMesh

10 years agoimporter improved
LockedLunatic [Sat, 25 Apr 2015 16:39:22 +0000 (18:39 +0200)]
importer improved

10 years agofixed GLenum (SkyBox Texture wasn't bind)
Peter Schaefer [Thu, 23 Apr 2015 20:54:00 +0000 (22:54 +0200)]
fixed GLenum (SkyBox Texture wasn't bind)