June 2007 Commit Log

« Development Statistics for Mercury

Commit Logs

Number of Commits:: 107
Number of Active Developers:: 2

axlecrusher 2007-06-30 10:23 #107

revert back, caused a big drop in FPS. Not sure if flicker is caused by it though.

1 lines of code changed in:

src: MercuryOGL.cpp (+1 -1)

axlecrusher 2007-06-30 09:42 #106

Fix the skybox

16 lines of code changed in:

src: ScreenOutdoors.cpp (+6 -4), ScreenOutdoors.h (+10 -2)

axlecrusher 2007-06-29 21:36 #105

It seems this may help resolve flickers

1 lines of code changed in:

src: MercuryOGL.cpp (+1)

axlecrusher 2007-06-29 21:28 #104

&= operator

4 lines of code changed in:

src: MercuryGLState.h (+2), MercuryObject.cpp (+2 -3)

axlecrusher 2007-06-29 21:21 #103

Clean up

1 lines of code changed in:

src: MercuryScreen.cpp (+1 -16), MercuryScreen.h (-2)

axlecrusher 2007-06-29 21:07 #102

make use of inherited states

33 lines of code changed in:

src: MercuryMesh.cpp (+1), MercuryObject.cpp (+15 -1), MercuryObject.h (+5), MercuryParticle.cpp (+2 -1), MercuryScreen.cpp (+4 -15), MercurySprite.cpp (+2), MercuryText.cpp (+3 -2), ScreenOutdoors.cpp (+1 -2)

axlecrusher 2007-06-29 19:21 #101

Merge the render pipline all into teh Update() function. This is cleaner and easier to follow. It will also help move things along when we start to render in a seperate thread.

117 lines of code changed in:

src: Mercury.cpp (+7 -4), MercuryDisplay.cpp (+15 -4), MercuryObject.cpp (+23 -32), MercuryObject.h (+4 -1), MercuryScreen.cpp (+60 -105), MercuryScreen.h (+5 -11), MercuryScreenManager.cpp (+1 -34), MercuryScreenManager.h (-2), ScreenDebugOverlay.cpp (+2 -2)

axlecrusher 2007-06-29 19:14 #100

add IsHidden function that looks at parent and self to determine if hidden

10 lines of code changed in:

src: MercuryObjectBase.cpp (+8), MercuryObjectBase.h (+2 -1)

axlecrusher 2007-06-29 11:00 #99

Reorder the first few startup commands to try to catch earlier crashes

2 lines of code changed in:

src: Mercury.cpp (+2 -2)

axlecrusher 2007-06-29 10:54 #98

Display's Init() function now creates the window and the rendering context. Display now has a create thread function too.

63 lines of code changed in:

src: Mercury.cpp (+5 -3), MercuryDisplay.cpp (+41 -14), MercuryDisplay.h (+7 -1), MercuryDisplaySoftwareC.cpp (+2 -2), MercuryDisplaySoftwareC.h (+1 -1), MercuryOGL.cpp (+6 -2), MercuryOGL.h (+1 -1)

axlecrusher 2007-06-29 09:35 #97

Add a packet based render queue

32 lines of code changed in:

src: MercuryDisplay.cpp (+6), MercuryDisplay.h (+26)

axlecrusher 2007-06-28 22:21 #96

add a circular queue

93 lines of code changed in:

src: MCQueue.h (new 89), Mercury-VC2005.vcproj (+4)

axlecrusher 2007-06-27 17:29 #95

Fix bug when destroying shaders

8 lines of code changed in:

src: MercuryOGL.cpp (+8 -13), MercuryOGL.h (-1)

axlecrusher 2007-06-27 16:39 #94

prevent extra emissions from being added when doing multiple light passes

3 lines of code changed in:

src: MercuryOGL.cpp (+3 -21)

axlecrusher 2007-06-27 15:51 #93

nsparallax uses 2 images now, not 3

6 lines of code changed in:

Themes/default/Files: nsparallax.frag (+4 -4)
Themes/default/Graphics: nsparallax.ini (+2 -6), rockdepth.png (del), rocknormalheight.png (new)

axlecrusher 2007-06-27 15:16 #92

Clipping planes can probably be replaced by glScissors. I seem to remember that the clipping plaes were put in mostly for use with the gui.

0 lines of code changed in:

src: MercuryObject.cpp (-18), MercuryObject.h (-12)

axlecrusher 2007-06-27 14:40 #91

Pick lights from the object's world space matrix

7 lines of code changed in:

src: MercuryDisplay.cpp (+5 -14), MercuryDisplay.h (+1 -1), MercuryObject.cpp (+1 -1)

axlecrusher 2007-06-26 23:01 #90

Build VBOs after loading the mesh

19 lines of code changed in:

src: MercuryLoadableModel.cpp (+1), MercuryMesh.cpp (+8 -5), MercuryMesh.h (+2), MercuryShapes.cpp (+8)

axlecrusher 2007-06-26 22:29 #89

Use the lighting state bit

20 lines of code changed in:

src: MercuryDisplay.cpp (+2 -2), MercuryDisplay.h (+3 -3), MercuryOGL.cpp (+5 -4), MercuryObject.cpp (+5 -5), MercuryObject.h (+3 -3), ScreenOutdoors.cpp (+2 -1)

axlecrusher 2007-06-26 22:23 #88

Fix particle rendering. It was running a shader.

3 lines of code changed in:

src: MercuryParticle.cpp (+3 -16), MercuryParticle.h (-1)

axlecrusher 2007-06-25 22:22 #87

Remove old commented out code

4 lines of code changed in:

src: MercuryDisplay.cpp (+3 -121), MercuryDisplay.h (+1 -33), MercuryOGL.cpp (-272), MercuryOGL.h (-22)

axlecrusher 2007-06-25 22:19 #86

Screens need to listen for the display resized message so they can regenerate their projection matrices.

22 lines of code changed in:

src: MercuryScreen.cpp (+20), MercuryScreen.h (+2)

axlecrusher 2007-06-25 22:08 #85

manually prerender teh camera early so that we can have fresh matrix data for the aimer to make things smooth

1 lines of code changed in:

src: ScreenFPS.cpp (+1)

axlecrusher 2007-06-25 21:55 #84

Make PointToScreenCoord more generic

4 lines of code changed in:

src: MercuryDisplay.cpp (+2 -2), MercuryDisplay.h (+1 -1), ScreenFPS.cpp (+1 -1)

axlecrusher 2007-06-25 21:51 #83

Fix PointToScreenCoord

4 lines of code changed in:

src: MercuryDisplay.cpp (+2 -11), MercuryDisplay.h (+1 -2), ScreenFPS.cpp (+1 -1)

axlecrusher 2007-06-25 21:21 #82

Cameras now work using the new method of locally stored camera matrices

16 lines of code changed in:

src: MercuryCamera.cpp (+4 -4), MercuryCamera.h (+4 -4), MercuryDisplay.cpp (+1 -1), MercuryScreen.cpp (+6 -34), MercuryScreen.h (+1 -1)

axlecrusher 2007-06-23 22:50 #81

Reorganize logic to prevent multiple sequential shader changes to shader 0.

7 lines of code changed in:

src: MercuryOGL.cpp (+7 -4)

axlecrusher 2007-06-23 22:38 #80

Bind to -1 to indicate an off pixel shader. Translate -1 into 0 when actually binding the shader in opengl.

6 lines of code changed in:

src: MercuryOGL.cpp (+6 -4)

axlecrusher 2007-06-23 21:13 #79

Working on new camera matrix stuff. Still broken

18 lines of code changed in:

src: MercuryCamera.cpp (+4 -4), MercuryDisplay.cpp (+12 -15), MercuryDisplay.h (+2 -6)

axlecrusher 2007-06-23 19:52 #78

clean up

3 lines of code changed in:

src: MercuryGLState.cpp (-15), MercuryGLState.h (+3 -5)

axlecrusher 2007-06-23 19:44 #77

filter shader changes

18 lines of code changed in:

src: MercuryOGL.cpp (+16 -8), MercuryOGL.h (+2)

axlecrusher 2007-06-23 18:28 #76

Fix disabling of pixel shaders. Fixes problem with sprites rendering with the wrong image if they are rendered right after and object using a shader.

5 lines of code changed in:

src: MercuryOGL.cpp (+5 -4), MercuryOGL.h (-3)

axlecrusher 2007-06-22 21:10 #75

Update

24 lines of code changed in:

src: MercuryOGL.cpp (+21 -8), MercuryParticle.cpp (+3 -3)

axlecrusher 2007-06-22 21:09 #74

set states in custom render and meshes can use shaders

2 lines of code changed in:

src: MercuryMesh.cpp (+2 -3)

axlecrusher 2007-06-22 21:08 #73

states before materials (something is goofy with states and sprites, I'm working on debugging it)

1 lines of code changed in:

src: MercuryText.cpp (+1 -1)

axlecrusher 2007-06-22 21:07 #72

Turn everything off at first

4 lines of code changed in:

src: MercuryDisplay.cpp (+4)

axlecrusher 2007-06-22 21:07 #71

all hex

13 lines of code changed in:

src: MercuryGLState.h (+13 -13)

axlecrusher 2007-06-22 21:05 #70

Set state before setting materials and shaders

1 lines of code changed in:

src: MercuryObject.cpp (+1)

axlecrusher 2007-06-22 21:05 #69

Now done in object custom render

0 lines of code changed in:

src: MercurySprite.cpp (-1)

axlecrusher 2007-06-21 21:37 #68

Use the stack to ensure previous state restoration

2 lines of code changed in:

src: ScreenOutdoors.cpp (+2 -1)

axlecrusher 2007-06-21 21:31 #67

Only clear the frame if we have to.

6 lines of code changed in:

src: MercuryDisplay.h (+1), MercuryGLState.h (+1), MercuryOGL.cpp (+1 -1), ScreenOutdoors.cpp (+3)

axlecrusher 2007-06-21 20:08 #66

forgot to remove this

0 lines of code changed in:

src: MercuryCamera.h (-2)

axlecrusher 2007-06-21 19:58 #65

fix object culling

36 lines of code changed in:

src: MercuryCamera.cpp (+2), MercuryCamera.h (+3 -1), MercuryDisplay.cpp (+12 -12), MercuryDisplay.h (+6 -3), MercuryDisplaySoftwareC.cpp (+2 -2), MercuryOGL.cpp (+3 -2), MercuryObject.cpp (+1 -1), MercuryScreen.cpp (+7 -6)

axlecrusher 2007-06-21 14:02 #64

Add specular seperately

5 lines of code changed in:

Themes/default/Files: rockShader.frag (+5 -4)

axlecrusher 2007-06-21 13:23 #63

move things to vertex shader for more speed

21 lines of code changed in:

Themes/default/Files: rockShader.frag (+7 -13), rockShader.vert (+14 -4)

axlecrusher 2007-06-21 12:07 #62

fix shader

15 lines of code changed in:

Themes/default/Files: rockShader.frag (+15 -18)

axlecrusher 2007-06-21 11:32 #61

use rock shader

2 lines of code changed in:

Themes/default/Models: Rock1.hgmdl.Material.ini (+2 -12)

axlecrusher 2007-06-21 11:32 #60

rock shader

78 lines of code changed in:

Themes/default/Files: rockShader.frag (new 55), rockShader.vert (new 23)

axlecrusher 2007-06-21 11:29 #59

New rock image and additional normals

6 lines of code changed in:

Themes/default/Models: Rock1.hgmdl.Material.ini (+6 -2), dirtyRock.png (new), dirtyRockNormal.png (new)

axlecrusher 2007-06-21 11:27 #58

Compress

0 lines of code changed in:

Themes/default/Models: dirt.png (changed)

axlecrusher 2007-06-21 11:10 #57

Update to what I have.

34 lines of code changed in:

src: MercuryCamera.cpp (+9), MercuryCamera.h (+3), MercuryDisplay.cpp (+9 -3), MercuryDisplay.h (+8 -2), MercuryDisplaySoftwareC.cpp (+1), ScreenTitle.cpp (+4)

axlecrusher 2007-06-20 20:39 #56

better self made dirt

0 lines of code changed in:

Themes/default/Models: dirt.png (changed)

axlecrusher 2007-06-18 00:02 #55

Working on moving the projection matrix out of display and into screens.

191 lines of code changed in:

src: MercuryDisplay.cpp (+91 -16), MercuryDisplay.h (+32 -16), MercuryObject.cpp (+9 -3), MercuryScreen.cpp (+53 -5), MercuryScreen.h (+6), ScreenFPS.cpp (-2)

axlecrusher 2007-06-17 23:59 #54

make unsigned and fix typo

12 lines of code changed in:

src: MercuryGLState.h (+12 -12)

axlecrusher 2007-06-17 23:56 #53

this is a mess, I think there is a better, more generic way to do rendering to textures

14 lines of code changed in:

src: MercuryDynTex.cpp (+14 -11)

axlecrusher 2007-06-17 23:56 #52

comment out render to _whatever_

2 lines of code changed in:

src: MercuryOGL.h (+2 -2)

axlecrusher 2007-06-17 23:55 #51

Clean up and merge DrawMesh functions

4 lines of code changed in:

src: MercuryOGL.cpp (+4 -153)

axlecrusher 2007-06-17 19:43 #50

fix compile

3 lines of code changed in:

src: ezSockets.cpp (+3 -2)

cnlohr 2007-06-17 01:08 #49

Fix warnings for Linux. If this creates any serious problems for windows,
revert.

15 lines of code changed in:

adv_set.c (+2 -1)
src: MercuryGLState.cpp (+1 -1), MercuryGLState.h (+3 -3), MercuryMesh.cpp (+5 -5), MercuryNetClient.cpp (+1 -1), MercuryObjectFactory.h (+1 -1), ScreenFPS2.cpp (+2 -2)

axlecrusher 2007-06-17 00:34 #48

use common draw

3 lines of code changed in:

src: MercuryMesh.cpp (+3 -3)

axlecrusher 2007-06-17 00:33 #47

update

6 lines of code changed in:

src: MercuryDisplay.h (+2 -1), MercuryDisplaySoftwareC.h (+1), MercuryOGL.h (+3 -1)

axlecrusher 2007-06-17 00:32 #46

Updates to SetState
Combine DrawMesh and DrawMeshVBO

64 lines of code changed in:

src: MercuryOGL.cpp (+64 -72)

axlecrusher 2007-06-14 20:34 #45

Multitexturing is now required

41 lines of code changed in:

src: MercuryOGL.cpp (+41 -67)

axlecrusher 2007-06-14 19:11 #44

Try to fast track existing textures

43 lines of code changed in:

src: MercuryTextureManager.cpp (+32 -3), MercuryTextureManager.h (+11 -10)

axlecrusher 2007-06-14 16:50 #43

Fix from charles

1 lines of code changed in:

src: MercuryString.cpp (+1 -1)

cnlohr 2007-06-13 21:37 #42

Add some new features to ezSockets

37 lines of code changed in:

src: ezSockets.cpp (+34 -1), ezSockets.h (+3)

axlecrusher 2007-06-13 07:55 #41

Fix crash and update particle field's light code

24 lines of code changed in:

src: MercuryOGL.cpp (+24 -12)

axlecrusher 2007-06-12 23:30 #40

check before deleting

10 lines of code changed in:

src: MercuryOGL.cpp (+10 -4)

axlecrusher 2007-06-12 23:00 #39

don't need constructor or destructor

1 lines of code changed in:

src: MercurySprite.cpp (+1 -12), MercurySprite.h (-3)

axlecrusher 2007-06-12 22:51 #38

we actually need this

9 lines of code changed in:

src: MercuryOGL.cpp (+9 -4)

axlecrusher 2007-06-12 22:25 #37

update

23 lines of code changed in:

src: MercuryOGL.cpp (+23 -25)

axlecrusher 2007-06-12 20:41 #36

We don't use the callback manager anymore. The message system works just as well.

5 lines of code changed in:

src: Mercury.cpp (+1 -1), MercuryCallback.h (+1 -1), MercuryParticle.h (+1 -1), MercurySprite.cpp (+2 -2)

axlecrusher 2007-06-12 20:41 #35

comment out old toggles

2 lines of code changed in:

src: MercuryDynTex.cpp (+2 -2)

axlecrusher 2007-06-12 20:37 #34

add stencil and shader states

2 lines of code changed in:

src: MercuryGLState.h (+2)

axlecrusher 2007-06-12 20:35 #33

Comment out a lot of old state functions

30 lines of code changed in:

src: MercuryDisplay.h (+10 -10), MercuryOGL.cpp (+11 -10), MercuryOGL.h (+9 -9)

axlecrusher 2007-06-09 23:21 #32

Fix leak

3 lines of code changed in:

src: MercuryTextureManager.cpp (+3 -4)

axlecrusher 2007-06-09 23:16 #31

Update for the new state tracking

18 lines of code changed in:

src: MercuryGLState.cpp (+2 -2), MercuryMesh.cpp (+1 -1), MercuryOGL.cpp (+9 -1), MercuryParticle.cpp (+5), MercuryScreen.cpp (+1 -1)

axlecrusher 2007-06-09 22:08 #30

Instead of an enum, use constant static longs that contain bit masks

61 lines of code changed in:

src: MercuryDisplay.cpp (+1 -1), MercuryDisplay.h (+3 -1), MercuryGLState.cpp (+9 -111), MercuryGLState.h (+17 -38), MercuryMesh.cpp (+2 -1), MercuryOGL.cpp (+17 -17), MercuryScreen.cpp (+10 -6), MercurySprite.cpp (+1 -1), MercuryText.cpp (+1 -1)

axlecrusher 2007-06-09 21:44 #29

Start using new state management. (unfinished)

206 lines of code changed in:

src: Mercury-VC2005.vcproj (+8), MercuryGLState.cpp (new 132), MercuryGLState.h (new 56), MercuryMesh.cpp (+3), MercuryObject.h (+3 -1), MercurySprite.cpp (+2), MercuryText.cpp (+2)

axlecrusher 2007-06-09 21:36 #28

Start using new state management. (unfinished)

127 lines of code changed in:

src: MercuryOGL.cpp (+115 -45), MercuryOGL.h (+1), MercuryScreen.cpp (+11 -10)

axlecrusher 2007-06-09 21:33 #27

add state tracking

19 lines of code changed in:

src: MercuryDisplay.cpp (+12), MercuryDisplay.h (+7)

axlecrusher 2007-06-06 23:17 #26

Adjust render pipeline so that we allow the video card the entire cycle of the program to draw

20 lines of code changed in:

src: Mercury.cpp (+2 -1), MercuryOGL.cpp (+1 -1), MercuryScreenManager.cpp (+16 -3), MercuryScreenManager.h (+1)

axlecrusher 2007-06-06 14:23 #25

Cleanup message system, faster

15 lines of code changed in:

src: MercuryMessages.cpp (+7 -21), MercuryMessages.h (+8 -11)

axlecrusher 2007-06-06 13:55 #24

Update copyright

1 lines of code changed in:

src: MHeap.h (+1 -1)

axlecrusher 2007-06-06 00:43 #23

Use a heap to store message times. Prevents collisions and I think it might be a little faster than the maps.

173 lines of code changed in:

src: MHeap.h (new 134), Mercury-VC2005.vcproj (+8), MercuryMessages.cpp (+10 -14), MercuryMessages.h (+21 -1)

axlecrusher 2007-06-05 10:45 #22

Update world

9 lines of code changed in:

Themes/default/Files: myworld2.ini (+9 -14)

axlecrusher 2007-06-05 10:43 #21

Forgot this

139 lines of code changed in:

src: MercuryObjectFactory.cpp (new 98), MercuryObjectFactory.h (new 41)

axlecrusher 2007-06-04 00:01 #20

Don't render text who's texture is not loaded

6 lines of code changed in:

src: MercuryText.cpp (+6 -3)

axlecrusher 2007-06-04 00:00 #19

getState

1 lines of code changed in:

src: MercuryObject.h (+1)

axlecrusher 2007-06-03 23:59 #18

mark textures as loaded or unloaded

4 lines of code changed in:

src: MercuryTexture.cpp (+4)

axlecrusher 2007-06-03 23:59 #17

Remove useless DynTexture

0 lines of code changed in:

src: ScreenFPS.cpp (-19), ScreenFPS.h (-3)

axlecrusher 2007-06-03 23:58 #16

crappy fix to a few issues

8 lines of code changed in:

src: MercuryMessages.cpp (+8 -3)

axlecrusher 2007-06-03 16:04 #15

Change for message driven texture loading

21 lines of code changed in:

src: MercuryText.cpp (+19 -22), MercuryText.h (+2 -2)

axlecrusher 2007-06-03 16:02 #14

take into account raw loading and its data

21 lines of code changed in:

src: MercuryTextureManager.cpp (+19 -4), MercuryTextureManager.h (+2 -2)

axlecrusher 2007-06-03 16:00 #13

load texture from raw

11 lines of code changed in:

src: MercuryTexture.cpp (+10), MercuryTexture.h (+1 -1)

axlecrusher 2007-06-02 21:59 #12

Remove texture loading callbacks

0 lines of code changed in:

src: MercuryParticle.cpp (-25), MercuryParticle.h (-2), MercurySprite.cpp (-22), MercurySprite.h (-3)

axlecrusher 2007-06-02 20:00 #11

4 lines of code changed in:

src: MercuryParticle.cpp (+2 -1), MercurySprite.cpp (+2 -1)

axlecrusher 2007-06-02 17:52 #10

Update

31 lines of code changed in:

src: MercuryParticle.cpp (+29 -2), MercuryParticle.h (+1), MercurySprite.cpp (+1)

axlecrusher 2007-06-02 17:39 #9

updates for texture loading

7 lines of code changed in:

src: MercuryDisplay.h (+1 -1), MercuryDisplaySoftwareC.cpp (+2 -2), MercuryDynTex.cpp (+2 -1), MercuryScreen.cpp (+2 -1)

axlecrusher 2007-06-02 17:10 #8

update texture loadings

18 lines of code changed in:

src: MercuryMaterial.cpp (+18 -13)

axlecrusher 2007-06-02 17:07 #7

Why are there so many create cache functions?

14 lines of code changed in:

src: MercuryOGL.cpp (+12 -14), MercuryOGL.h (+2 -2)

axlecrusher 2007-06-02 16:59 #6

temporary change

3 lines of code changed in:

src: MercuryText.cpp (+3 -2)

axlecrusher 2007-06-02 16:57 #5

Remove a multitude of different loading and registering methods. Improve messaging texture loading sytem

40 lines of code changed in:

src: MercuryTextureManager.cpp (+32 -165), MercuryTextureManager.h (+8 -12)

axlecrusher 2007-06-02 16:51 #4

update for new texture loading

29 lines of code changed in:

src: MercurySprite.cpp (+26 -3), MercurySprite.h (+3 -1)

axlecrusher 2007-06-02 16:48 #3

Rework texture loading and data

87 lines of code changed in:

src: MercuryTexture.cpp (+41 -71), MercuryTexture.h (+46 -40)

axlecrusher 2007-06-02 16:38 #2

Copy the callback vector

6 lines of code changed in:

src: MercuryMessages.cpp (+6 -3)

axlecrusher 2007-06-02 16:37 #1

function to test the owner

1 lines of code changed in:

src: MercuryMessages.h (+1)

May 2007 »

Generated by StatCVS 0.3