September 2006 Commit Log

« Development Statistics for Mercury

Commit Logs

Number of Commits:: 238
Number of Active Developers:: 2

cnlohr 2006-09-30 14:20 #238

Get the DisplayEE ready for the normal PS2 renderer

10 lines of code changed in:

src: MercuryDisplayEE.cpp (+8), MercuryDisplayEE.h (+2)

cnlohr 2006-09-30 14:15 #237

Fix: When not virtual, the code was getting called here, even though it was on the PS2

2 lines of code changed in:

src: MercuryDisplaySoftwareC.h (+2 -2)

cnlohr 2006-09-30 13:06 #236

fix warnings on PS2

8 lines of code changed in:

src: MercuryCallback.h (+7 -7), MercuryVertex.h (+1 -3)

cnlohr 2006-09-30 12:53 #235

Fix compile

4 lines of code changed in:

src: MercuryThreadsEE.cpp (+4 -4)

cnlohr 2006-09-29 23:54 #234

Placeholder, compile this instead of the normal sound manager on the PS2

0 lines of code changed in:

src: MercurySoundManagerEE.cpp (new)

cnlohr 2006-09-29 23:46 #233

This is just a placeholder, it can be compiled instaed of normal threads if threads are not possible

97 lines of code changed in:

src: MercuryThreadsEE.cpp (new 97)

cnlohr 2006-09-29 17:59 #232

Add the operate command, this will be a facilitator for expressions

a + b, c == d, g .= z etc.

263 lines of code changed in:

src: PStack.cpp (+261), PStack.h (+2 -1)

axlecrusher 2006-09-29 11:31 #231

Fix some textures not showing up

4 lines of code changed in:

src: MercuryOGL.cpp (+4 -5)

axlecrusher 2006-09-29 10:46 #230

Don't calculate the normals for geometries that are not triangles
Remove commented code

7 lines of code changed in:

src: MercuryMesh.cpp (+7 -29)

cnlohr 2006-09-29 02:42 #229

Loadable Model uses IsAnimated now

4 lines of code changed in:

src: MercuryLoadableModel.cpp (+4 -4)

cnlohr 2006-09-29 02:42 #228

OOPS! faulty merge

1 lines of code changed in:

src: MercuryShapes.cpp (+1 -1)

cnlohr 2006-09-29 02:41 #227

Fix shapes

20 lines of code changed in:

src: MercuryShapes.cpp (+20 -137)

cnlohr 2006-09-29 02:39 #226

Give mesh direct access.

1 lines of code changed in:

src: MercuryGeometry.h (+1)

cnlohr 2006-09-29 02:39 #225

Add IsAnimated flag as well as fixing Normal Calculations

17 lines of code changed in:

src: MercuryMesh.cpp (+13 -25), MercuryMesh.h (+4)

axlecrusher 2006-09-28 16:27 #224

cleanup

7 lines of code changed in:

src: MercuryThreads.cpp (+5 -7), MercuryThreads.h (+2 -3)

axlecrusher 2006-09-28 15:29 #223

We always use a color

3 lines of code changed in:

src: ScreenHelloWorld.cpp (+3 -10)

axlecrusher 2006-09-28 15:22 #222

Fix a lot of warnings with -Wall

74 lines of code changed in:

src: BetaBetaMari.cpp (+1 -1), CopperPrimitives.cpp (-21), MerCadBase.cpp (+14 -14), MerCadBase.h (+2 -2), Mercury.cpp (+1 -2), MercuryFiles.cpp (+2 -2), MercuryINI.cpp (+1 -1), MercuryLoadableModel.cpp (+7 -7), MercuryLoadableModel.h (+1 -1), MercuryODE.cpp (+5 -5), MercuryOGL.cpp (+1 -1), MercuryObject.cpp (+2 -2), MercuryObjectCommands.cpp (+7 -5), MercuryScreenManager.cpp (+2 -2), MercuryShapes.cpp (+3 -3), MercuryString.cpp (+1 -1), MercuryText.cpp (+1 -1), MercuryTexture.cpp (+1 -1), MercuryThreads.cpp (+2 -2), MercuryThreads.h (+1), MercuryWindowSDL.cpp (+2), PStack.cpp (+2 -2), ScreenCopper.cpp (+1 -1), ScreenHelloWorld.cpp (+1 -1), ScreenMapEditor.cpp (+13 -13)

axlecrusher 2006-09-28 11:36 #221

make thread safe

12 lines of code changed in:

src: MercuryCallback.h (+12 -7)

axlecrusher 2006-09-27 22:50 #220

When was this removed?

3 lines of code changed in:

src: Mercury-VC2003.vcproj (+3)

axlecrusher 2006-09-27 22:47 #219

Use CLBKMAN for validating callbacks before doing them.

18 lines of code changed in:

src: MercuryParticle.cpp (+2 -1), MercuryParticle.h (+2), MercurySprite.cpp (+8), MercurySprite.h (+1), MercuryTextureManager.cpp (+5 -2)

axlecrusher 2006-09-27 22:44 #218

Instance of ClbkMan

1 lines of code changed in:

src: Mercury.cpp (+1)

axlecrusher 2006-09-27 22:43 #217

Callback manager (tracker)

29 lines of code changed in:

src: MercuryCallback.h (+29)

cnlohr 2006-09-27 03:17 #216

Set output location to be in the root folder so we don't have the annoying problem of trying to set the debug path.

8 lines of code changed in:

src: Mercury.dsp (+8 -8)

axlecrusher 2006-09-24 23:15 #215

Fix some stuff

8 lines of code changed in:

src: MercuryMesh.cpp (+2 -1), MercuryMesh.h (+2 -1), MercuryShapes.cpp (+4 -3)

cnlohr 2006-09-24 22:58 #214

Transotale

51 lines of code changed in:

src: MercuryDisplay.cpp (+9 -7), MercuryMatrix.cpp (+41), MercuryMatrix.h (+1)

cnlohr 2006-09-24 02:03 #213

commit the updated window along with a fix to prevent it from crashing when trying to generate the window

25 lines of code changed in:

src: MercuryWindowEE.cpp (+24 -43), MercuryWindowEE.h (+1 -2)

cnlohr 2006-09-24 02:02 #212

update makefile

1 lines of code changed in:

Makefile.PS2 (+1 -1)

cnlohr 2006-09-23 22:15 #211

Update PS2 build

2 lines of code changed in:

Makefile.PS2 (+2 -2)

cnlohr 2006-09-23 22:15 #210

get ready to display... something

5 lines of code changed in:

src: MercuryDisplayEE.cpp (+3), MercuryDisplayEE.h (+2 -1)

cnlohr 2006-09-23 22:09 #209

Allow GL_EXT specifics

0 lines of code changed in:

src: Mercury.cpp (-5)

cnlohr 2006-09-23 22:09 #208

fix compile on PS2

5 lines of code changed in:

src: MercuryDisplayEE.cpp (+4 -1), MercuryInputEE.h (+1 -1)

cnlohr 2006-09-23 22:08 #207

allow destruction of OGL's GL_EXT

10 lines of code changed in:

src: MercuryGLExt.cpp (+2), MercuryOGL.cpp (+7), MercuryOGL.h (+1)

cnlohr 2006-09-23 22:06 #206

HACK: Allow mercury to operate without any sound driver

3 lines of code changed in:

src: MercurySoundManager.cpp (+3)

cnlohr 2006-09-23 22:06 #205

allow mercury to be used without threads if necessiary with the NO_THREADS directive

3 lines of code changed in:

src: MercuryTextureManager.cpp (+3 -1)

axlecrusher 2006-09-23 22:00 #204

fix a warning

2 lines of code changed in:

src: MercuryOGL.cpp (+2)

cnlohr 2006-09-23 21:58 #203

PS2 Actually works! Well... sort of... It still needs to know how to display stuff to the screen

5 lines of code changed in:

Makefile.PS2 (+5 -5)

axlecrusher 2006-09-23 21:58 #202

Fix warnings

60 lines of code changed in:

src: Makefile.am (+1 -1), MercuryCommands.h (+3 -1), MercuryFiles.h (+6), MercuryGLExt.h (+2), MercuryINI.cpp (+1 -1), MercuryInput.h (+6), MercuryMaterial.cpp (+1 -1), MercuryMatrixStack.h (+1 -1), MercuryObjectBase.h (+2), PStack.cpp (+27 -28), PStack.h (+10 -10)

cnlohr 2006-09-23 21:05 #201

fix EE compile

7 lines of code changed in:

src: MercuryInputEE.cpp (+2 -2), MercuryThreads.h (+1 -1), MercuryWindowEE.cpp (+4 -6)

cnlohr 2006-09-23 21:04 #200

Update the PS2 file.

8 lines of code changed in:

Makefile.PS2 (+8 -3)

axlecrusher 2006-09-23 20:36 #199

Update for DrawNoGeometry

65 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+64 -55), MercuryDisplaySoftwareC.h (+1 -2)

axlecrusher 2006-09-23 19:45 #198

Sprites don't need geometries.
Seperate drawing that do and do not use geometries.
Disable states after interleaved array drawing.

72 lines of code changed in:

src: MercuryDisplay.h (+1), MercuryDisplaySoftwareC.h (+1), MercuryDisplay_D3D.h (+1), MercuryMesh.cpp (+8 -3), MercuryMesh.h (+4 -1), MercuryOGL.cpp (+54 -54), MercuryOGL.h (+3), MercurySprite.cpp (-3)

axlecrusher 2006-09-22 22:27 #197

Remove vertice stuff

0 lines of code changed in:

src: MercuryGeometry.h (-13)

axlecrusher 2006-09-22 22:27 #196

update

7 lines of code changed in:

src: MercuryOGL.cpp (+7 -4)

axlecrusher 2006-09-22 22:26 #195

Fix

8 lines of code changed in:

src: MercuryODE.cpp (+8 -6)

axlecrusher 2006-09-22 22:26 #194

Fix compile(untested)

5 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+5 -5)

axlecrusher 2006-09-22 22:20 #193

update

1 lines of code changed in:

src: MercuryMesh.h (+1 -1)

cnlohr 2006-09-22 12:59 #192

update project

0 lines of code changed in:

src: Mercury.dsp (-8)

axlecrusher 2006-09-22 12:05 #191

Fixes

4 lines of code changed in:

src: MercuryMesh.cpp (+2 -2), MercuryMesh.h (+2 -2)

axlecrusher 2006-09-22 11:37 #190

Update to allow for loading a common set of vertices as well as other types of geometries to draw. I'll debug on windows.

96 lines of code changed in:

src: MercuryDisplayTypes.h (+2), MercuryGeometry.h (+10 -8), MercuryLoadableModel.cpp (+32 -14), MercuryMesh.cpp (+2 -2), MercuryMesh.h (+9 -3), MercuryShapes.cpp (+30 -30), MercurySprite.cpp (+11 -10)

axlecrusher 2006-09-22 10:18 #189

Update

2 lines of code changed in:

Docs: MercuryBinaryModelFormat.txt (+2 -1)

cnlohr 2006-09-22 01:49 #188

FIX the perspective problem... but still suffering from some minor glitches wrt z-buffer.

18 lines of code changed in:

src: Mercury-VC2003.vcproj (+1 -1), MercuryDisplaySoftwareC.cpp (+17 -32)

cnlohr 2006-09-22 01:05 #187

update project

6 lines of code changed in:

src: Mercury-VC2003.sln (-12), Mercury-VC2003.vcproj (+6 -49)

cnlohr 2006-09-22 00:55 #186

REVERT! The new method was much more convoluted. I went back to the new one, except modified the searching, so that it is slightly faster on quads, and drastically faster on triangles.

84 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+84 -72)

cnlohr 2006-09-21 22:49 #185

New softwareC blitter. This should be much faster than the old one. It still has a handfull of bugs and needs to be INT'ed

108 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+108 -77)

axlecrusher 2006-09-21 15:08 #184

Set textures to CLAMP_UV. Also invert V on models differently so
REPEAT_V is not required.

3 lines of code changed in:

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

axlecrusher 2006-09-21 14:49 #183

Cleanup and remove MercuryDisplayTypes.cpp

4 lines of code changed in:

src: Makefile.am (+1 -2), MercuryDisplay.cpp (+3 -3), MercuryDisplayTypes.cpp (del), MercuryDisplayTypes.h (-26)

cnlohr 2006-09-21 13:18 #182

Ortho Z of 0 should not produce all z's of zero.

1 lines of code changed in:

src: MercuryDisplay.cpp (+1 -1)

cnlohr 2006-09-20 17:22 #181

FIX: Actually do the display of things without textures.

5 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+5 -4)

cnlohr 2006-09-20 16:02 #180

fix compile

6 lines of code changed in:

src: MercuryUtil.cpp (+4), MercuryWindowEE.h (+2 -2)

cnlohr 2006-09-20 16:02 #179

update makefile for PS2

4 lines of code changed in:

Makefile.PS2 (+4 -4)

cnlohr 2006-09-20 15:52 #178

use virtual ~'s even though unessiary to prevent warnings

4 lines of code changed in:

src: MercuryFiles.h (+4 -2)

cnlohr 2006-09-20 15:48 #177

Prepare threads for PS2 use

12 lines of code changed in:

src: MercuryThreads.h (+12)

cnlohr 2006-09-20 15:47 #176

Prefix rotation modes with RM_

7 lines of code changed in:

src: MercuryLoadableModel.cpp (+1 -1), MercuryODE.cpp (+1 -1), MercuryObject.cpp (+1 -1), MercuryObjectBase.h (+4 -4)

cnlohr 2006-09-20 15:46 #175

commit some display stuff, for the EE

13 lines of code changed in:

src: MercuryDisplay.cpp (+4 -4), MercuryDisplayEE.cpp (+1 -548), MercuryDisplayEE.h (+8 -107)

axlecrusher 2006-09-20 11:51 #174

fix crashes

16 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+16 -18)

cnlohr 2006-09-20 02:45 #173

Do not-full-alpha calc on lum-alpha stuff

6 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+6 -6)

cnlohr 2006-09-20 02:40 #172

oops! Minor miscalculation on the alpha there... (Fixed)

4 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+4 -4)

cnlohr 2006-09-20 02:35 #171

Pay attention to diffuse alpha's

58 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+58 -23)

axlecrusher 2006-09-19 22:50 #170

fake shitty sphere map

17 lines of code changed in:

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

cnlohr 2006-09-19 21:58 #169

keep the software c window right

1 lines of code changed in:

src: Win32Window.cpp (+1 -1)

cnlohr 2006-09-19 21:55 #168

allow for non-640x480 window with SoftwareC

1 lines of code changed in:

src: MercuryWindowSDL.cpp (+1 -1)

cnlohr 2006-09-19 21:51 #167

Fix window for use with windows.

1 lines of code changed in:

src: Win32Window.cpp (+1)

cnlohr 2006-09-19 21:46 #166

SoftwareC in linux!

70 lines of code changed in:

src: Makefile.am (+1 -1), MercuryDisplay.cpp (+1 -1), MercuryDisplaySoftwareC.cpp (-6), MercuryOGL.cpp (+2 -4), MercuryWindowSDL.cpp (+63 -31), MercuryWindowSDL.h (+3 -1)

cnlohr 2006-09-19 20:57 #165

fix warning

1 lines of code changed in:

src: MercuryOGL.cpp (+1 -1)

cnlohr 2006-09-19 20:56 #164

Move all SW Renderer stuff into Window.

44 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+10 -89), MercuryDisplaySoftwareC.h (-5), MercuryWindow.h (+1 -1), Win32Window.cpp (+28), Win32Window.h (+5 -1)

cnlohr 2006-09-19 20:54 #163

Add ABS to math

2 lines of code changed in:

src: MercuryMath.h (+2)

cnlohr 2006-09-19 20:18 #162

Update/fix corner'd polys, and screen shots

9 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+9 -6)

cnlohr 2006-09-19 15:59 #161

Update + add /QIfist flag to supress _ftol which is eating up almost 5% of our run time.

1 lines of code changed in:

src: Mercury.dsp (+1 -1)

cnlohr 2006-09-19 15:55 #160

Many optimizations (~25% speed increase possible)

34 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+34 -16)

axlecrusher 2006-09-19 14:24 #159

Fix linux compile

1 lines of code changed in:

src: MercuryInput.h (+1 -1)

cnlohr 2006-09-18 23:29 #158

MakeOBJ application

219 lines of code changed in:

Util/MakeOBJ: MakeOBJ.c (new 90), MakeOBJ.dsp (new 100), MakeOBJ.dsw (new 29), MakeOBJ.exe (new)

axlecrusher 2006-09-18 21:29 #157

Manually transpose matrix

14 lines of code changed in:

src: MercuryMatrix.cpp (+14 -13)

axlecrusher 2006-09-18 21:25 #156

Remove unused rotate, delete commented code, and add const

7 lines of code changed in:

src: MercuryMatrix.cpp (+3 -25), MercuryMatrix.h (+4 -4)

axlecrusher 2006-09-18 20:19 #155

Push and flush view matrix when switching perspectives

6 lines of code changed in:

src: MercuryDisplay.cpp (+6), MercuryScreen.cpp (-7), MercuryScreen.h (-2)

cnlohr 2006-09-18 20:17 #154

SoftwareC -- a bit faster (~5%)

56 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+56 -59)

cnlohr 2006-09-18 16:56 #153

WORKING!! Well mostly, yeah... sorta

27 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+26 -19), MercuryDisplaySoftwareC.h (+1 -1)

cnlohr 2006-09-18 16:32 #152

Almost working... Actually do textures now.

130 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+115 -16), MercuryDisplaySoftwareC.h (+15 -1)

cnlohr 2006-09-18 14:51 #151

Working Z-buffer, and W per-pixel culling

133 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+130 -9), MercuryDisplaySoftwareC.h (+3 -3)

axlecrusher 2006-09-18 13:09 #150

cleanup

7 lines of code changed in:

src: MercuryDisplay.cpp (+7 -7)

axlecrusher 2006-09-18 12:02 #149

push and pop view

6 lines of code changed in:

src: ScreenMapEditor.cpp (+6)

axlecrusher 2006-09-18 11:45 #148

Make private

2 lines of code changed in:

src: MercuryDisplay.h (+2 -3)

axlecrusher 2006-09-18 11:43 #147

fix sprite sizing

3 lines of code changed in:

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

axlecrusher 2006-09-18 11:39 #146

Clean up

9 lines of code changed in:

src: MercuryObject.cpp (+5 -8), MercuryParticle.cpp (+4 -7)

axlecrusher 2006-09-18 11:36 #145

Protect the ProjectionStack inside of display since we have to do special things when changing it.

46 lines of code changed in:

src: MercuryDisplay.cpp (+31 -12), MercuryDisplay.h (+13 -2), MercuryDisplaySoftwareC.cpp (+1 -1), MercuryOGL.cpp (+1 -1)

axlecrusher 2006-09-18 10:50 #144

Update

22 lines of code changed in:

src: MercuryObject.cpp (+10 -3), MercuryParticle.cpp (+8 -3), MercurySprite.cpp (+4 -2)

axlecrusher 2006-09-18 10:47 #143

projection updates

11 lines of code changed in:

src: MercuryDisplay.cpp (+7 -11), MercuryDisplay.h (+3 -4), MercuryOGL.cpp (+1 -1)

cnlohr 2006-09-18 00:58 #142

Actually do polygons.

55 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+55 -4)

cnlohr 2006-09-17 21:30 #141

Update:Remove lists

4 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+4 -48), MercuryDisplaySoftwareC.h (-16)

axlecrusher 2006-09-17 21:15 #140

remove senseless opengl stuff

0 lines of code changed in:

src: MercuryDisplay_D3D.h (-11)

axlecrusher 2006-09-17 21:08 #139

Use mercury's software matrix stack

11 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+11 -174), MercuryDisplaySoftwareC.h (-26)

axlecrusher 2006-09-17 21:07 #138

remove commented code

0 lines of code changed in:

src: MercuryOGL.cpp (-3)

axlecrusher 2006-09-17 20:44 #137

Lights needs matrix data too

5 lines of code changed in:

src: MercuryOGL.cpp (+5)

axlecrusher 2006-09-17 20:31 #136

Don't continue loading if the file header is incorrect.

8 lines of code changed in:

src: MercuryLoadableModel.cpp (+8 -3)

axlecrusher 2006-09-17 20:19 #135

Fix ODE matrix transposition

6 lines of code changed in:

src: MercuryODE.cpp (+6 -6)

cnlohr 2006-09-17 20:19 #134

fix build in linux fully!

5 lines of code changed in:

src: Makefile.am (+4 -4), MercuryDisplay.cpp (+1 -1)

axlecrusher 2006-09-17 19:58 #133

Fix model animation

1 lines of code changed in:

src: MercuryLoadableModel.cpp (+1 -3)

axlecrusher 2006-09-17 19:55 #132

Newline at end of file

2 lines of code changed in:

src: MercuryMatrixStack.h (+2 -1)

axlecrusher 2006-09-17 19:48 #131

Project update

1 lines of code changed in:

src: Mercury-VC2003.vcproj (+1)

axlecrusher 2006-09-17 19:47 #130

Quit using VC 6.

3 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+3 -3)

axlecrusher 2006-09-17 19:43 #129

Updated

14 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+5 -1), MercuryDisplaySoftwareC.h (+3), MercuryDisplay_D3D.cpp (+5), MercuryDisplay_D3D.h (+1)

axlecrusher 2006-09-17 19:42 #128

Update

2 lines of code changed in:

src: MercuryMatrixStack.h (+2)

axlecrusher 2006-09-17 19:41 #127

Use our own matrix stacks

4 lines of code changed in:

src: MercuryParticle.cpp (+4 -2)

axlecrusher 2006-09-17 19:39 #126

Move to MercuryMatrix

1 lines of code changed in:

src: MercuryTypes.cpp (+1 -59), MercuryTypes.h (-4)

axlecrusher 2006-09-17 19:35 #125

Use our own matrix stacks

4 lines of code changed in:

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

axlecrusher 2006-09-17 19:33 #124

Updated

166 lines of code changed in:

src: MercuryMatrix.cpp (+152), MercuryMatrix.h (+14)

axlecrusher 2006-09-17 19:31 #123

Use our own matrix stacks

17 lines of code changed in:

src: MercuryOGL.cpp (+17 -189)

axlecrusher 2006-09-17 19:25 #122

Use our own matrix stacks

138 lines of code changed in:

src: MercuryDisplay.cpp (+128 -69), MercuryDisplay.h (+10 -29)

cnlohr 2006-09-17 19:22 #121

update for linux

6 lines of code changed in:

src: MercuryInputSDL.cpp (+1 -1), MercuryOGL_Ext.cpp (+3 -3), MercuryWindowSDL.cpp (+1 -1), MercuryWindowSDL.h (+1 -1)

cnlohr 2006-09-17 19:21 #120

Update for linux

3 lines of code changed in:

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

cnlohr 2006-09-17 19:21 #119

Makefile update for linux

3 lines of code changed in:

src: Makefile.am (+3 -3)

axlecrusher 2006-09-17 19:17 #118

Each screen pushes and pop's its own view stack.

9 lines of code changed in:

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

axlecrusher 2006-09-17 13:17 #117

Make things actually look like row major

36 lines of code changed in:

src: MercuryTypes.cpp (+36 -30)

axlecrusher 2006-09-17 11:51 #116

Increment number of frames drawn

2 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+2)

cnlohr 2006-09-17 03:47 #115

Commit line function. NOT: It's not working fully yet. I must write an algorithm to automatically know to go to the extremes of the screen, instead of spending time drawing the line from something like x=-100000 to x=1000000 or something else that's dumb.

88 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+82 -9), MercuryDisplaySoftwareC.h (+6 -5)

cnlohr 2006-09-17 02:53 #114

Optimize: static some things, do all the index calculations when possible, merge both modelview and perspective matricies togeathere whenever possible, and other such optimizations, ~3x faster now.

24 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+22 -21), MercuryDisplaySoftwareC.h (+2)

cnlohr 2006-09-17 02:30 #113

Remove Cache, add D3D

8 lines of code changed in:

src: Mercury.dsp (+8 -8)

cnlohr 2006-09-17 02:29 #112

Don't do a DC lookup with windows every time. This slows us down some and makes something that looks an aweful lot like a memory leak.

5 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+4 -5), MercuryDisplaySoftwareC.h (+1)

cnlohr 2006-09-17 02:22 #111

Fix renderer

75 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+66 -43), MercuryDisplaySoftwareC.h (+9 -9)

cnlohr 2006-09-17 02:22 #110

Load identity when doing perspective view. For some reason, OGL is already at the identity matrix, however when doing our own matrix stacks, it ends up not bein ident'd at this point.

2 lines of code changed in:

src: MercuryDisplay.cpp (+2 -1)

cnlohr 2006-09-17 01:59 #109

Move on to next one if texture is still loading during dead search.

2 lines of code changed in:

src: MercuryTextureManager.cpp (+2)

axlecrusher 2006-09-17 00:00 #108

Small update

3 lines of code changed in:

src: MercuryMatrixStack.h (+3 -3)

axlecrusher 2006-09-16 23:57 #107

Project update

4 lines of code changed in:

src: Mercury-VC2003.vcproj (+4)

axlecrusher 2006-09-16 23:56 #106

Software matrix stack. Needed for Direct3D and probably the software render too.

51 lines of code changed in:

src: MercuryMatrixStack.h (new 51)

axlecrusher 2006-09-16 23:32 #105

null

1 lines of code changed in:

src: MercuryDisplay.cpp (+1)

axlecrusher 2006-09-16 23:31 #104

reorganize

7 lines of code changed in:

src: MercuryDisplay.h (+7 -5)

axlecrusher 2006-09-16 23:29 #103

Update

10 lines of code changed in:

src: MercuryDisplay_D3D.cpp (+10)

axlecrusher 2006-09-16 17:33 #102

DirectX files

316 lines of code changed in:

src: Mercury-VC2003.vcproj (+6), MercuryDisplay_D3D.cpp (new 196), MercuryDisplay_D3D.h (new 114)

axlecrusher 2006-09-16 17:32 #101

Cleanup

10 lines of code changed in:

src: MercuryDisplay.cpp (+8), MercuryDisplay.h (+1 -1), MercuryOGL.cpp (-16), MercuryOGL.h (-3), MercuryWindow.h (+1)

axlecrusher 2006-09-16 00:25 #100

Vertice counting

10 lines of code changed in:

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

axlecrusher 2006-09-16 00:22 #99

Remove unused code

5 lines of code changed in:

src: MercuryMesh.cpp (+4 -93), MercuryMesh.h (+1 -45)

axlecrusher 2006-09-15 16:40 #98

Remove cache (used glLists)

20 lines of code changed in:

src: Mercury.cpp (-2), MercuryDisplay.cpp (-3), MercuryDisplay.h (-7), MercuryDisplaySoftwareC.cpp (+4 -4), MercuryDisplaySoftwareC.h (+5 -5), MercuryLoadableModel.cpp (+5 -6), MercuryMesh.cpp (+5 -40), MercuryMesh.h (-12), MercuryModel.cpp (-1), MercuryOGL.cpp (-25), MercuryOGL.h (-5), MercuryObject.cpp (+1 -2), MercuryObject.h (-3), MercuryScreen.cpp (-1), MercuryScreen.h (-1), MercurySprite.cpp (-1)

axlecrusher 2006-09-15 16:12 #97

update

0 lines of code changed in:

src: Mercury-VC2003.vcproj (-45)

axlecrusher 2006-09-15 16:10 #96

remove cache (unused)

0 lines of code changed in:

src: MercuryCache.cpp (del), MercuryCache.h (del)

axlecrusher 2006-09-15 16:06 #95

remove MercuryCache.h include

18 lines of code changed in:

src: Mercury.cpp (+2 -4), MercuryDisplay.cpp (+3 -3), MercuryMesh.cpp (+4 -3), MercuryModel.cpp (+1 -1), MercurySprite.cpp (+1 -1), ScreenDebugOverlay.cpp (+7 -7)

axlecrusher 2006-09-15 16:04 #94

Oops, should be able to load textures for now

8 lines of code changed in:

src: MercuryMaterial.cpp (+8 -1)

axlecrusher 2006-09-15 16:03 #93

assert

8 lines of code changed in:

src: MercuryTheme.cpp (+8 -2)

axlecrusher 2006-09-15 16:01 #92

Correct load function

1 lines of code changed in:

src: MercuryLoadableModel.cpp (+1 -1)

axlecrusher 2006-09-15 14:11 #91

Mercury will automatically prepend the path to the image filenames

11 lines of code changed in:

Themes/default/Models: building3.hgmdl.Material01.ini (+1 -1), jupitertexture.ini (+1 -1), logo.hgmdl.initialShadingGroup.ini (+2 -2), terrain.hgmdl.Material01.ini (+1 -1)
Themes/default/Models/coke: coke.hgmdl.CokeBottom.ini (+2 -2), coke.hgmdl.CokeSide.ini (+2 -2), coke.hgmdl.CokeTop.ini (+2 -2)

axlecrusher 2006-09-15 14:08 #90

put jupiter in INI

1 lines of code changed in:

Themes/default: metrics.ini (+1)

axlecrusher 2006-09-15 14:07 #89

Ability to prepend path to texture filename

8 lines of code changed in:

src: MercuryMaterial.cpp (+7 -6), MercuryMaterial.h (+1 -1)

axlecrusher 2006-09-15 12:55 #88

use path

1 lines of code changed in:

src: MercuryModel.cpp (+1 -1)

axlecrusher 2006-09-15 12:54 #87

Use model base class

2 lines of code changed in:

src: MercuryODE.cpp (+2 -2)

axlecrusher 2006-09-15 12:54 #86

Null terminate

2 lines of code changed in:

src: MercuryLoadableModel.cpp (+2 -1)

axlecrusher 2006-09-15 12:53 #85

update

2 lines of code changed in:

src: ScreenTitle.cpp (+2 -2)

axlecrusher 2006-09-15 11:49 #84

Move some texture stuff around

9 lines of code changed in:

src: MercuryOGL.cpp (+9 -4)

axlecrusher 2006-09-15 11:48 #83

NULL terminate string and use m_path not MODEL:

3 lines of code changed in:

src: MercuryLoadableModel.cpp (+3 -2)

axlecrusher 2006-09-15 11:48 #82

Fix incorrect graphics

2 lines of code changed in:

Themes/default/Models/coke: coke.hgmdl.CokeBottom.ini (+1 -1), coke.hgmdl.CokeTop.ini (+1 -1)

axlecrusher 2006-09-15 10:46 #81

Remove unused code

3 lines of code changed in:

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

cnlohr 2006-09-15 00:56 #80

Make ODE able to do collision with Geometries.

19 lines of code changed in:

src: MercuryODE.cpp (+19 -56)

cnlohr 2006-09-15 00:55 #79

Add GetGeometries accessor

10 lines of code changed in:

src: MercuryMesh.cpp (+9), MercuryMesh.h (+1)

axlecrusher 2006-09-14 22:38 #78

Update model file names

4 lines of code changed in:

Themes/default/Files: coke.ini (+1 -1), mercury.ini (+2 -2), myworld.ini (+1 -1)

axlecrusher 2006-09-14 22:36 #77

converted models

62 lines of code changed in:

Themes/default/Models: building3.hgmdl (new), building3.hgmdl.Material01.ini (new 10), terrain.hgmdl (new), terrain.hgmdl.Material01.ini (new 10)
Themes/default/Models/coke: coke.hgmdl (new), coke.hgmdl.CokeBottom.ini (new 14), coke.hgmdl.CokeSide.ini (new 14), coke.hgmdl.CokeTop.ini (new 14)

axlecrusher 2006-09-14 22:34 #76

align 32

2 lines of code changed in:

src: MercuryColor.h (+1 -1), MercuryTypes.h (+1 -1)

cnlohr 2006-09-14 20:59 #75

Add Geometry to project

8 lines of code changed in:

src: Mercury.dsp (+8)

cnlohr 2006-09-14 20:58 #74

Faster, still wrong though

12 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+12 -25)

cnlohr 2006-09-14 20:30 #73

Well... something displays...

179 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+176 -14), MercuryDisplaySoftwareC.h (+3 -1)

axlecrusher 2006-09-14 17:58 #72

Null terminate char*

4 lines of code changed in:

src: MercuryLoadableModel.cpp (+4 -5)

axlecrusher 2006-09-14 17:21 #71

Remove DrawUV and DrawNormal.
Remove immediate drawing from geometry rendering.
Tweak Enable and disable lights.

6 lines of code changed in:

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

axlecrusher 2006-09-14 17:17 #70

Functions for UV recalculation

3 lines of code changed in:

src: MercurySprite.h (+3)

axlecrusher 2006-09-14 17:16 #69

Recalculate UV after text load.

1 lines of code changed in:

src: MercuryText.cpp (+1)

axlecrusher 2006-09-14 17:15 #68

Recalculate UVs after graphic load

25 lines of code changed in:

src: MercurySprite.cpp (+25 -14)

axlecrusher 2006-09-14 17:14 #67

Only load material .ini files into materials

12 lines of code changed in:

src: MercuryMaterial.cpp (+12 -11)

axlecrusher 2006-09-14 17:11 #66

Don't use cache anywhere.

1 lines of code changed in:

src: MercuryObject.cpp (+1 -1)

cnlohr 2006-09-14 16:21 #65

Update (filling more stuff in)

166 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+109 -15), MercuryDisplaySoftwareC.h (+57 -5)

axlecrusher 2006-09-14 12:26 #64

Use m_name

1 lines of code changed in:

src: MercuryMaterial.cpp (+1 -2)

axlecrusher 2006-09-14 12:24 #63

Construct indices

13 lines of code changed in:

src: MercuryShapes.cpp (+13 -2)

axlecrusher 2006-09-14 00:03 #62

Small updates

4 lines of code changed in:

src: MercuryOGL.cpp (+4 -5)

axlecrusher 2006-09-13 23:46 #61

Cleanup

3 lines of code changed in:

src: MercuryDisplay.h (+1 -11), MercuryDisplaySoftwareC.cpp (-17), MercuryDisplaySoftwareC.h (-4), MercuryOGL.cpp (+2 -55), MercuryOGL.h (-5)

axlecrusher 2006-09-13 15:45 #60

We need both glActiveTextureARB and glClientActiveTextureARB

2 lines of code changed in:

src: MercuryOGL.cpp (+2 -1)

axlecrusher 2006-09-13 15:37 #59

glEnableClientState
glDisableClientState

7 lines of code changed in:

src: MercuryOGL.cpp (+7 -7)

axlecrusher 2006-09-13 15:28 #58

Fix multitextures

2 lines of code changed in:

src: MercuryOGL.cpp (+2 -1)

cnlohr 2006-09-13 15:21 #57

actually retrieve norm's from MS3d

24 lines of code changed in:

Util/MS3DPlugin: msHGMDLExportPlugin.dll (changed), msHGMDLPlugIn.cpp (+24 -2)

axlecrusher 2006-09-13 15:20 #56

Fixed model

0 lines of code changed in:

Themes/default/Models: logo.hgmdl (changed)

axlecrusher 2006-09-13 15:05 #55

Fix broken vertice morphing

2 lines of code changed in:

src: MercuryLoadableModel.cpp (+2 -2)

axlecrusher 2006-09-13 14:44 #54

Read all indices at once

1 lines of code changed in:

src: MercuryLoadableModel.cpp (+1 -9)

axlecrusher 2006-09-13 14:37 #53

Fix leak

1 lines of code changed in:

src: MercuryLoadableModel.cpp (+1 -1)

axlecrusher 2006-09-13 14:22 #52

remove logging command

0 lines of code changed in:

src: MercuryOGL.cpp (-1)

axlecrusher 2006-09-13 14:22 #51

Fix inverted texture mapping

1 lines of code changed in:

src: MercuryLoadableModel.cpp (+1 -1)

axlecrusher 2006-09-13 14:12 #50

Draw from indice array

53 lines of code changed in:

src: MercuryOGL.cpp (+53 -39)

axlecrusher 2006-09-13 14:10 #49

Geometry is now a pointer. Also fill indice array with indices.

9 lines of code changed in:

src: MercuryLoadableModel.cpp (+9 -12)

axlecrusher 2006-09-13 14:09 #48

Add an indice array

10 lines of code changed in:

src: MercuryGeometry.h (+10)

axlecrusher 2006-09-13 14:09 #47

Update

24 lines of code changed in:

src: MercuryMesh.cpp (+16 -33), MercuryMesh.h (+8 -19)

axlecrusher 2006-09-13 14:07 #46

use accessor

1 lines of code changed in:

src: MercuryODE.cpp (+1 -1)

axlecrusher 2006-09-13 14:06 #45

remove draw mesh

2 lines of code changed in:

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

axlecrusher 2006-09-13 14:04 #44

Geometry is now a pointer

48 lines of code changed in:

src: MercuryShapes.cpp (+34 -34), MercurySprite.cpp (+14 -14)

axlecrusher 2006-09-12 22:24 #43

Project update

16 lines of code changed in:

src: Mercury-VC2003.vcproj (+16 -5)

axlecrusher 2006-09-12 22:24 #42

Fix compile

2 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+1 -1), MercuryDisplaySoftwareC.h (+1 -1)

axlecrusher 2006-09-12 22:23 #41

MercuryVertPacked -> MercuryVertex

2 lines of code changed in:

src: MercuryMesh.cpp (+2 -4)

axlecrusher 2006-09-12 22:23 #40

Update and copyright

65 lines of code changed in:

src: MercuryGeometry.cpp (+29 -1), MercuryGeometry.h (+36 -7)

axlecrusher 2006-09-12 22:21 #39

Update

11 lines of code changed in:

src: MercuryLoadableModel.cpp (+6 -8), MercuryMesh.h (+5 -18)

axlecrusher 2006-09-12 22:16 #38

MercuryVertPacked -> MercuryVertex

20 lines of code changed in:

src: MercuryShapes.cpp (+20 -20)

axlecrusher 2006-09-12 22:15 #37

Update

34 lines of code changed in:

src: MercuryDisplay.h (+6 -5), MercuryOGL.cpp (+21 -25), MercuryOGL.h (+7 -6)

axlecrusher 2006-09-12 22:13 #36

Updated. Charles you might want to copyright these.

9 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+4 -5), MercuryDisplaySoftwareC.h (+5 -6)

axlecrusher 2006-09-12 22:11 #35

MercuryVertPacked -> MercuryVertex

2 lines of code changed in:

src: MercuryODE.cpp (+2 -2)

axlecrusher 2006-09-12 22:10 #34

Polygons are going be reworked once geometries and vertices are completed.

11 lines of code changed in:

src: MercuryPoly.cpp (+5 -5), MercuryPoly.h (+6 -5)

axlecrusher 2006-09-12 22:06 #33

Mercury now only has MercuryVertex and a vertex wrapper. This will help clear up confusion in many cases. Also MercuryNormal is nothing more than a MercuryPoint.

28 lines of code changed in:

src: MercuryVertex.cpp (+9 -50), MercuryVertex.h (+19 -59)

axlecrusher 2006-09-12 09:33 #32

Fix compile

2 lines of code changed in:

src: MercuryDisplaySoftwareC.h (+2 -1)

cnlohr 2006-09-11 23:36 #31

redefine the exports for use in non-classful languages.

And prepare for the DLL project for .net 2k3

81 lines of code changed in:

src: Mercury-VC2003.sln (+12), Mercury.cpp (+12 -3), Mercury.def (+18 -16), Mercury.h (+6 -3), MercuryCommands.cpp (+1 -1), MercuryCommands.h (+1 -1), MercuryMessages.cpp (+1 -1), MercuryMessages.h (+1 -1), PStack.cpp (+10 -10), PStack.h (+11 -11), Win32Window.cpp (+1), global.h (+7)

cnlohr 2006-09-11 15:24 #30

update for .def file, it's out of date and does not reflect the project as it is.

19 lines of code changed in:

src: Mercury.def (+19 -15)

cnlohr 2006-09-11 15:23 #29

Functions for classless and other non-c++ languages

156 lines of code changed in:

src: MercuryCommands.cpp (+13), MercuryCommands.h (+4), MercuryMessages.cpp (+7), MercuryMessages.h (+4 -1), PStack.cpp (+114), PStack.h (+14)

cnlohr 2006-09-11 15:22 #28

floating point warning

1 lines of code changed in:

src: ScreenGameForBlind.cpp (+1 -1)

cnlohr 2006-09-11 01:03 #27

Update VC6 Project

8 lines of code changed in:

src: Mercury.dsp (+8 -24)

cnlohr 2006-09-11 01:03 #26

Fix compile.

5 lines of code changed in:

src: MercuryDisplaySoftwareC.cpp (+4), MercuryDisplaySoftwareC.h (+1), ScreenSound.h (-1), ScreenTitle.h (-1)

cnlohr 2006-09-11 01:01 #25

Update, to prevent crash on title screen

1 lines of code changed in:

Themes/default: metrics.ini (+1 -1)

axlecrusher 2006-09-08 20:02 #24

Add geometry files and remove unsupported formats

8 lines of code changed in:

src: MercuryGeometry.cpp (new 1), MercuryGeometry.h (new 7), MercuryMD5Model.cpp (del), MercuryMD5Model.h (del), MercuryMilkshapeModel.cpp (del), MercuryMilkshapeModel.h (del)

axlecrusher 2006-09-08 20:00 #23

Update project with new files and remove old

16 lines of code changed in:

src: Mercury-VC2003.vcproj (+16 -85)

axlecrusher 2006-09-08 19:57 #22

Changes to use MercuryGeometry (incomplete)

76 lines of code changed in:

src: MercuryMesh.cpp (+48 -12), MercuryMesh.h (+28 -30)

axlecrusher 2006-09-08 19:56 #21

Support VertexBufferObjects

18 lines of code changed in:

src: MercuryGLExt.cpp (+1), MercuryGLExt.h (+1), MercuryOGL_Ext.cpp (+12), MercuryOGL_Ext.h (+4)

axlecrusher 2006-09-08 19:54 #20

Changes to use MercuryGeometry (incomplete)

67 lines of code changed in:

src: MercuryDisplay.h (+2), MercuryLoadableModel.cpp (+23 -15), MercuryOGL.cpp (+41), MercuryOGL.h (+1)

axlecrusher 2006-09-08 19:54 #19

Reduce number of types

11 lines of code changed in:

src: MercuryDisplayTypes.h (+11 -1)

axlecrusher 2006-09-08 19:52 #18

use HGMDL

8 lines of code changed in:

src: ScreenMapEditor.cpp (+2 -2), ScreenSound.cpp (+1 -1), ScreenSound.h (+2 -2), ScreenTitle.cpp (+3 -3)

axlecrusher 2006-09-08 19:50 #17

Changes to use MercuryGeometry (incomplete)

12 lines of code changed in:

src: MercuryODE.cpp (+12 -9)

axlecrusher 2006-09-08 19:49 #16

use HGMDL

3 lines of code changed in:

src: ScreenJunq.cpp (+1 -2), ScreenJunq.h (+2 -3)

axlecrusher 2006-09-08 19:47 #15

Changes to use MercuryGeometry (incomplete)

104 lines of code changed in:

src: MercuryModel.cpp (+9 -8), MercuryModel.h (+1 -1), MercuryShapes.cpp (+69 -56), MercurySprite.cpp (+25 -21)

axlecrusher 2006-09-08 19:45 #14

Changes in regards to MercuryGeometry

12 lines of code changed in:

src: MercuryVertex.cpp (+10 -10), MercuryVertex.h (+2 -9)

axlecrusher 2006-09-08 19:43 #13

Fix return bug

2 lines of code changed in:

src: MercuryVector.h (+2 -2)

axlecrusher 2006-09-07 14:08 #12

update

6 lines of code changed in:

src: Mercury-VC2003.vcproj (+6)

axlecrusher 2006-09-07 14:07 #11

Load HGMDL not milkshape

1 lines of code changed in:

src: ScreenTitle.cpp (+1 -1)

axlecrusher 2006-09-07 14:03 #10

HGMDL version of logo

14 lines of code changed in:

Themes/default/Models: logo.hgmdl (new), logo.hgmdl.initialShadingGroup.ini (new 14)

axlecrusher 2006-09-07 13:56 #9

Optimized model

0 lines of code changed in:

Themes/default/Models: jupiter.hgmdl (changed)

axlecrusher 2006-09-06 16:38 #8

comment out broken stuff

4 lines of code changed in:

Util/ModelOptimizer: main.cpp (+4 -4)

cnlohr 2006-09-06 11:59 #7

Add support for a software-c renderer

324 lines of code changed in:

src: Mercury.dsp (+8), MercuryDisplaySoftwareC.cpp (new 218), MercuryDisplaySoftwareC.h (new 98)

cnlohr 2006-09-06 11:58 #6

Support different renderer types

32 lines of code changed in:

src: MercuryWindow.h (+14 -4), Win32Window.cpp (+14 -21), Win32Window.h (+4 -3)

cnlohr 2006-09-06 11:58 #5

unconst a lot of functions so a software renderer is possible.

51 lines of code changed in:

src: MercuryDisplay.cpp (+10 -2), MercuryDisplay.h (+13 -11), MercuryOGL.cpp (+16 -10), MercuryOGL.h (+12 -12)

cnlohr 2006-09-06 11:55 #4

Rename the global basic type "NONE" to "IET_NONE" we shouldn't have such a ambiguous term running a muck.

8 lines of code changed in:

src: MercuryInput.cpp (+5 -5), MercuryInput.h (+2 -2), MercuryInputWin32.cpp (+1 -1)

axlecrusher 2006-09-03 19:02 #3

Fixes for linux compile

4 lines of code changed in:

src: Mercury.cpp (+1 -1), MercuryMath.h (+1), MercuryTypes.cpp (+1), PStack.h (+1 -1)

axlecrusher 2006-09-01 16:36 #2

Turn point sprites only when needed

2 lines of code changed in:

src: MercuryOGL.cpp (+2 -2)

cnlohr 2006-09-01 01:14 #1

Up to date project for VC6

16 lines of code changed in:

src: Mercury.dsp (+16)

August 2006 »

Generated by StatCVS 0.3