Skip to content

Commit

Permalink
Tweak specular lighting.
Browse files Browse the repository at this point in the history
Release 0.2.3

git-svn-id: https://www.williamfeely.info/svn/dxgl@187 8a90861a-4eca-46d5-b744-240ff16d0c4d
  • Loading branch information
dxgldotorg committed Jun 29, 2012
1 parent 81e5693 commit f2c3bdb
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ReadMe.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DXGL 0.2.1
DXGL 0.2.3
http://www.williamfeely.info/wiki/DXGL

== Introduction ==
Expand Down
4 changes: 2 additions & 2 deletions common/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

#define DXGLMAJOR 0
#define DXGLMINOR 2
#define DXGLPOINT 2
#define DXGLPOINT 3
#define DXGLBUILD 0

#define DXGLVERNUMBER DXGLMAJOR,DXGLMINOR,DXGLPOINT,DXGLBUILD
#define DXGLVERQWORD (((unsigned __int64)DXGLMAJOR<<48)+((unsigned __int64)DXGLMINOR<<32)+((unsigned __int64)DXGLPOINT<<16)+(unsigned __int64)DXGLBUILD)
#define DXGLVERSTRING "0.2.2.0"
#define DXGLVERSTRING "0.2.3.0"


#endif //__VERSION_H
2 changes: 1 addition & 1 deletion common/version.nsh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
!define PRODUCT_VERSION "0.2.2"
!define PRODUCT_VERSION "0.2.3"
3 changes: 2 additions & 1 deletion ddraw/shadergen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,8 @@ ambient = ambientcolor / 255.0;\n";
static const char op_dirlight[] = "DirLight(lightX);\n";
static const char op_pointlight[] = "PointLight(lightX);\n";
static const char op_spotlight[] = "SpotLight(lightX);\n";
static const char op_colorout[] = "gl_FrontColor = (material.diffuse * diffuse) + (material.ambient * ambient) + material.emissive;\n\
static const char op_colorout[] = "gl_FrontColor = (material.diffuse * diffuse) + (material.ambient * ambient)\n\
+ (material.specular * specular) + material.emissive;\n\
gl_FrontSecondaryColor = (material.specular * specular);\n";
static const char op_colorvert[] = "gl_FrontColor = rgba0.bgra;\n";
static const char op_color2vert[] = "gl_FrontSecondaryColor = rgba1.bgra;\n";
Expand Down

0 comments on commit f2c3bdb

Please sign in to comment.