]> git.leopard-lacewing.eu Git - cgue_weave.git/log
cgue_weave.git
9 years agocurrent status
LockedLunatic [Fri, 22 Apr 2016 18:35:06 +0000 (20:35 +0200)]
current status

9 years agovereinfache Draw Befehl (verschiedene DRAW Typen/Target)
Peter Schaefer [Thu, 21 Apr 2016 09:27:17 +0000 (11:27 +0200)]
vereinfache Draw Befehl (verschiedene DRAW Typen/Target)
BugFix (F3&F6 Draw Wireframe)

removed drawWire(...) -> drawModel(mat,dr_Wire)
removed drawBBox(...) -> drawModel(mat,dr_BBox)

9 years agomoved Shader out from SceneObj
Peter Schaefer [Thu, 21 Apr 2016 08:21:36 +0000 (10:21 +0200)]
moved Shader out from SceneObj

9 years agoderzeitiger Stand
LockedLunatic [Thu, 21 Apr 2016 00:28:32 +0000 (02:28 +0200)]
derzeitiger Stand

9 years agoMerge branch 'bloom' of lva.cg.tuwien.ac.at:Weave into bloom bloom
Peter Schaefer [Mon, 18 Apr 2016 11:07:39 +0000 (13:07 +0200)]
Merge branch 'bloom' of lva.cg.tuwien.ac.at:Weave into bloom

9 years agogetShader Methode geändert,
Peter Schaefer [Mon, 18 Apr 2016 11:05:49 +0000 (13:05 +0200)]
getShader Methode geändert,
Bloom läuft
Window Resize -> Buffer läuft

9 years agoconvex duck hit meshes
LockedLunatic [Sun, 17 Apr 2016 00:00:33 +0000 (02:00 +0200)]
convex duck hit meshes

9 years agofixed fBO (disabled MipMap)
Peter Schaefer [Sat, 16 Apr 2016 08:44:31 +0000 (10:44 +0200)]
fixed fBO (disabled MipMap)

9 years agoTexture kann schon Gezeichnet werden,
Peter Schaefer [Thu, 14 Apr 2016 17:39:25 +0000 (19:39 +0200)]
Texture kann schon Gezeichnet werden,
aber entweder wird der Buffer nicht richtig geschrieben oder gelesen...

9 years agomore BufferClasses
Peter Schaefer [Thu, 14 Apr 2016 17:21:10 +0000 (19:21 +0200)]
more BufferClasses

9 years agoEffect Blur(AccBuffer) umbenannt
Peter Schaefer [Thu, 14 Apr 2016 10:20:10 +0000 (12:20 +0200)]
Effect Blur(AccBuffer) umbenannt
Texturen aufgeteilt in Buffer & Image

9 years agomoved bind/gen/deleteBuffer ->Shader
Peter Schaefer [Wed, 13 Apr 2016 18:00:03 +0000 (20:00 +0200)]
moved bind/gen/deleteBuffer ->Shader
CollisionShapes statt BBox

9 years agostatic setUniformLocation
Peter Schaefer [Wed, 13 Apr 2016 16:01:42 +0000 (18:01 +0200)]
static setUniformLocation
removed plane&skybox VS

9 years agopointlights (hopefully) almost done
LockedLunatic [Wed, 13 Apr 2016 15:44:35 +0000 (17:44 +0200)]
pointlights (hopefully) almost done

9 years agoPlane
Peter Schaefer [Wed, 13 Apr 2016 14:39:16 +0000 (16:39 +0200)]
Plane
BasicShader

9 years agodefined static Shaders (Basic,Lighting,Blur)
Peter Schaefer [Wed, 13 Apr 2016 11:29:46 +0000 (13:29 +0200)]
defined static Shaders (Basic,Lighting,Blur)
corrected const for Shader

9 years agoremoved Texture from Model (no longer needed)
Peter Schaefer [Tue, 12 Apr 2016 14:32:15 +0000 (16:32 +0200)]
removed Texture from Model (no longer needed)

9 years agoShader::Active (_shader braucht nicht mehr übergeben werden)
Peter Schaefer [Tue, 12 Apr 2016 13:54:55 +0000 (15:54 +0200)]
Shader::Active (_shader braucht nicht mehr übergeben werden)
useShader (Model -> SceneObject)
useTexture -> Texture Class (Model -> SceneObject)

9 years agoSDL Profile CORE
Peter Schaefer [Mon, 11 Apr 2016 12:46:01 +0000 (14:46 +0200)]
SDL Profile CORE

9 years agomoved bullet to include&lib (Version Debug/Release)
Peter Schaefer [Wed, 6 Apr 2016 09:05:42 +0000 (11:05 +0200)]
moved bullet to include&lib (Version Debug/Release)

9 years agominor fixes
Peter Schaefer [Tue, 5 Apr 2016 21:33:07 +0000 (23:33 +0200)]
minor fixes
Release LIBS

9 years agohopefully fixed bullet path and Builds
Peter Schaefer [Tue, 5 Apr 2016 20:59:42 +0000 (22:59 +0200)]
hopefully fixed bullet path and Builds

9 years agoPlayer Hitboxes
LockedLunatic [Wed, 30 Mar 2016 11:17:59 +0000 (13:17 +0200)]
Player Hitboxes

9 years agomerged Lights
Peter Schaefer [Tue, 5 Apr 2016 18:56:30 +0000 (20:56 +0200)]
merged Lights

9 years agofixed some MemoryLeaks
Peter Schaefer [Tue, 5 Apr 2016 11:16:19 +0000 (13:16 +0200)]
fixed some MemoryLeaks
optimized bind and draw
collMesh (_col.dae) will be loaded as mesh if exist
GL Warning disabled

9 years agofixed missing BBox
Peter Schaefer [Wed, 30 Mar 2016 11:26:43 +0000 (13:26 +0200)]
fixed missing BBox

9 years agosome fixes
Peter Schaefer [Wed, 30 Mar 2016 11:12:01 +0000 (13:12 +0200)]
some fixes
BBox unsichtbar????

9 years agomoved Collision Mesh into SceneObject
Peter Schaefer [Wed, 30 Mar 2016 10:57:16 +0000 (12:57 +0200)]
moved Collision Mesh into SceneObject
badhack use Same Mesh for collision

9 years agodefined a Name for Meshes
Peter Schaefer [Mon, 28 Mar 2016 13:38:16 +0000 (15:38 +0200)]
defined a Name for Meshes
added bind for Model, unbind for Model and Shader

9 years agoadded Debug Entries
Peter Schaefer [Sun, 27 Mar 2016 13:35:33 +0000 (15:35 +0200)]
added Debug Entries

9 years agoupdated bullet
Peter Schaefer [Sat, 23 Jan 2016 07:24:50 +0000 (08:24 +0100)]
updated bullet
fixed bullet linking

9 years agoupdated libs
Peter Schaefer [Fri, 22 Jan 2016 16:44:41 +0000 (17:44 +0100)]
updated libs

10 years agolever added; animations are imported and almost usable
LockedLunatic [Mon, 29 Jun 2015 22:26:27 +0000 (00:26 +0200)]
lever added; animations are imported and almost usable

10 years agoshow FPS -> F2
Peter Schaefer [Mon, 29 Jun 2015 21:01:28 +0000 (23:01 +0200)]
show FPS -> F2

10 years agoadded Margin -> doesnt fix glitches
Peter Schaefer [Thu, 25 Jun 2015 20:01:42 +0000 (22:01 +0200)]
added Margin -> doesnt fix glitches

10 years agoadded switch for Transparency -> F9
Peter Schaefer [Thu, 25 Jun 2015 19:21:47 +0000 (21:21 +0200)]
added switch for Transparency -> F9

10 years agoadded real FULLSCREEN -> F10
Peter Schaefer [Thu, 25 Jun 2015 18:49:49 +0000 (20:49 +0200)]
added real FULLSCREEN -> F10

10 years agoWindow is now resizeable
Peter Schaefer [Thu, 25 Jun 2015 18:02:20 +0000 (20:02 +0200)]
Window is now resizeable

10 years agoFPS capped
Peter Schaefer [Wed, 24 Jun 2015 15:36:21 +0000 (17:36 +0200)]
FPS capped
small modifications for falling

10 years agoMerge branch 'bullet' of lva.cg.tuwien.ac.at:Weave bullet
Peter Schaefer [Wed, 24 Jun 2015 14:44:59 +0000 (16:44 +0200)]
Merge branch 'bullet' of lva.cg.tuwien.ac.at:Weave

10 years agosmall jump fix
Peter Schaefer [Wed, 24 Jun 2015 13:24:13 +0000 (15:24 +0200)]
small jump fix
replaced Fragmentcolor with gl_FragColor (shader)

10 years agolevel is a tiny bit farther (but doesn't have UVs fixed yet)
LockedLunatic [Mon, 22 Jun 2015 22:00:57 +0000 (00:00 +0200)]
level is a tiny bit farther (but doesn't have UVs fixed yet)

10 years agolevel half done
LockedLunatic [Mon, 22 Jun 2015 13:40:14 +0000 (15:40 +0200)]
level half done

10 years agosmall fix
Peter Schaefer [Mon, 22 Jun 2015 12:36:29 +0000 (14:36 +0200)]
small fix

10 years agoeventBoxen working again
Peter Schaefer [Mon, 22 Jun 2015 12:34:24 +0000 (14:34 +0200)]
eventBoxen working again

10 years agowalking against Walls Jumpy
Peter Schaefer [Mon, 22 Jun 2015 12:17:11 +0000 (14:17 +0200)]
walking against Walls Jumpy

10 years agoheights working
Peter Schaefer [Mon, 22 Jun 2015 11:48:28 +0000 (13:48 +0200)]
heights working

10 years agoMerge lva.cg.tuwien.ac.at:Weave into bullet
Peter Schaefer [Mon, 22 Jun 2015 10:05:22 +0000 (12:05 +0200)]
Merge lva.cg.tuwien.ac.at:Weave into bullet

10 years agoBullet Shapes looking correct
Peter Schaefer [Tue, 16 Jun 2015 14:13:34 +0000 (16:13 +0200)]
Bullet Shapes looking correct

10 years agofixed non movable Mouse
Peter Schaefer [Tue, 16 Jun 2015 13:38:20 +0000 (15:38 +0200)]
fixed non movable Mouse

10 years agoremoved Triangle,Box,Splitmat BBoxsizes
Peter Schaefer [Tue, 16 Jun 2015 13:27:09 +0000 (15:27 +0200)]
removed Triangle,Box,Splitmat BBoxsizes

10 years agoremoved scaling fom Normals
Peter Schaefer [Tue, 16 Jun 2015 12:52:43 +0000 (14:52 +0200)]
removed scaling fom Normals
fixed not every point was loaded

10 years agoremoved obj and bin Files of bullet
Peter Schaefer [Mon, 15 Jun 2015 12:01:30 +0000 (14:01 +0200)]
removed obj and bin Files of bullet

10 years agodisabled FrameRateFix
Peter Schaefer [Mon, 15 Jun 2015 10:21:25 +0000 (12:21 +0200)]
disabled FrameRateFix

10 years agoadded Graphix EFFECTS (enable/disable)
Peter Schaefer [Sun, 14 Jun 2015 11:10:02 +0000 (13:10 +0200)]
added Graphix EFFECTS (enable/disable)
added MotionBlur

10 years agofixed transparency bug with sky
Peter Schaefer [Sun, 14 Jun 2015 10:14:35 +0000 (12:14 +0200)]
fixed transparency bug with sky

10 years agoFalling and walking against the lvl works
Peter Schaefer [Sun, 14 Jun 2015 08:41:32 +0000 (10:41 +0200)]
Falling and walking against the lvl works
still wrong CollideMeshes

10 years agojump and fall works
Peter Schaefer [Fri, 12 Jun 2015 13:31:47 +0000 (15:31 +0200)]
jump and fall works
wrong collision Meshes!

10 years agomoved playerEvents to Marvin
Peter Schaefer [Tue, 9 Jun 2015 14:09:02 +0000 (16:09 +0200)]
moved playerEvents to Marvin

10 years agoremoved collision Tree
Peter Schaefer [Tue, 9 Jun 2015 07:35:56 +0000 (09:35 +0200)]
removed collision Tree

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