Menu
▾
▴
[cadcdev-svn-commits] SF.net SVN: cadcdev: [543] tiki
|
From: <at...@us...> - 2007-11-11 20:50:37
|
Revision: 543
http://cadcdev.svn.sourceforge.net/cadcdev/?rev=543&view=rev
Author: atani
Date: 2007-11-11 12:50:23 -0800 (Sun, 11 Nov 2007)
Log Message:
-----------
added NDS support to color3, updated paths in xcode project
Modified Paths:
--------------
tiki/include/Tiki/color.h
tiki/include/Tiki/color3.h
tiki/osx/Tiki.xcodeproj/project.pbxproj
Modified: tiki/include/Tiki/color.h
===================================================================
--- tiki/include/Tiki/color.h 2007-11-11 20:14:56 UTC (rev 542)
+++ tiki/include/Tiki/color.h 2007-11-11 20:50:23 UTC (rev 543)
@@ -86,7 +86,6 @@
#else
glColor(pack1555(r, g, b, a));
#endif
-
}
static uint32 pack( float a, float r, float g, float b ) {
Modified: tiki/include/Tiki/color3.h
===================================================================
--- tiki/include/Tiki/color3.h 2007-11-11 20:14:56 UTC (rev 542)
+++ tiki/include/Tiki/color3.h 2007-11-11 20:50:23 UTC (rev 543)
@@ -56,9 +56,12 @@
}
void select() const {
- glColor4f( r, g, b, 1.0f );
+#if TIKI_PLAT != TIKI_NDS
+ glColor4f( r, g, b, 1.0 );
+#else
+ glColor(Color.pack1555(r, g, b, 1.0));
+#endif
}
-
float r, g, b;
};
Modified: tiki/osx/Tiki.xcodeproj/project.pbxproj
===================================================================
--- tiki/osx/Tiki.xcodeproj/project.pbxproj 2007-11-11 20:14:56 UTC (rev 542)
+++ tiki/osx/Tiki.xcodeproj/project.pbxproj 2007-11-11 20:50:23 UTC (rev 543)
@@ -653,10 +653,10 @@
C42BD2D6078FC9BF00061670 /* base */ = {
isa = PBXGroup;
children = (
- 6400608D0CDF9DC800969916 /* init_flags_default.cpp */,
C4AD53070793CE9F00E1B779 /* debug.cpp */,
C4F5148D0799FBA10001D0D0 /* endian.cpp */,
C4AD52290793B4CD00E1B779 /* file.cpp */,
+ 6400608D0CDF9DC800969916 /* init_flags_default.cpp */,
C480A22E0835BEA6006AEE4B /* object.cpp */,
C45D0B90083F030200F9F467 /* timeline.cpp */,
C45D0B91083F030200F9F467 /* timepoint.cpp */,
@@ -686,12 +686,12 @@
C42BD4B0078FCB0A00061670 /* Source */ = {
isa = PBXGroup;
children = (
- 64ED762B0C7CFB9400D16D5C /* platnet.cpp */,
- C498925907EE98040050854A /* platgl.cpp */,
- C498925707EE97E70050854A /* TikiMain.m */,
C4B5838C0794CFC7004D22F2 /* init_shutdown.cpp */,
C453994A079A509100F3A584 /* plathid.mm */,
+ C498925907EE98040050854A /* platgl.cpp */,
+ 64ED762B0C7CFB9400D16D5C /* platnet.cpp */,
C472B717079AFA0200F0C00A /* platthread.cpp */,
+ C498925707EE97E70050854A /* TikiMain.m */,
C4539A1B079AF3D100F3A584 /* tikitime.cpp */,
);
name = Source;
@@ -700,9 +700,9 @@
C42BD4B1078FCB0E00061670 /* Include */ = {
isa = PBXGroup;
children = (
- 64ED762D0C7CFBA100D16D5C /* platnet.h */,
C4AD527D0793C96A00E1B779 /* glhdrs.h */,
C42BD4B3078FCB5A00061670 /* pch.h */,
+ 64ED762D0C7CFBA100D16D5C /* platnet.h */,
C472B719079AFA1600F0C00A /* platthread.h */,
C4F51501079A05B70001D0D0 /* TikiMain.h */,
C4AD510E0793AC2F00E1B779 /* tikitypes.h */,
@@ -713,9 +713,9 @@
C42BD4F1078FCEA200061670 /* Notes */ = {
isa = PBXGroup;
children = (
+ C42BD4F4078FCEC300061670 /* design.rtf */,
C40D72C1083723B50084B52D /* design_v2.rtf */,
C40D72C2083723B50084B52D /* drawing_model.txt */,
- C42BD4F4078FCEC300061670 /* design.rtf */,
);
name = Notes;
sourceTree = "<group>";
@@ -779,17 +779,17 @@
C4AD50FD0793ABEC00E1B779 /* base */ = {
isa = PBXGroup;
children = (
+ C4AD50E30793ABA000E1B779 /* debug.h */,
64ED76270C7CFB7E00D16D5C /* endian.h */,
- 64ED76280C7CFB7E00D16D5C /* net.h */,
- C4EAEB1F08678F1F003F5342 /* TikiAll.h */,
- C4AD50E30793ABA000E1B779 /* debug.h */,
C4AD522B0793B4E300E1B779 /* file.h */,
C4AD50EB0793ABA000E1B779 /* list.h */,
+ 64ED76280C7CFB7E00D16D5C /* net.h */,
C480A2360835BEF0006AEE4B /* object.h */,
C4AD50EE0793ABA000E1B779 /* refcnt.h */,
C4ACBDA30837CFFD00FA287E /* scene.h */,
C40D72F9083730CB0084B52D /* tee.h */,
C472B702079AF7A300F0C00A /* thread.h */,
+ C4EAEB1F08678F1F003F5342 /* TikiAll.h */,
C4AD50F10793ABA000E1B779 /* tikitime.h */,
C40D72CE083729BD0084B52D /* timeline.h */,
C40D72D108372B3A0084B52D /* timepoint.h */,
@@ -1007,7 +1007,6 @@
children = (
C4F5154B079A0B9E0001D0D0 /* alphafader.cpp */,
C4F5154C079A0B9E0001D0D0 /* expxymover.cpp */,
- 644D23540CDFE82D00E7F291 /* lightbarmenu.cpp */,
C4F5154D079A0B9E0001D0D0 /* logxymover.cpp */,
C4F5154E079A0B9E0001D0D0 /* tintfader.cpp */,
);
@@ -1017,10 +1016,11 @@
C4F51549079A0B840001D0D0 /* drawables */ = {
isa = PBXGroup;
children = (
+ C4F51553079A0BAE0001D0D0 /* banner.cpp */,
223226800A165A600035025E /* console.cpp */,
- C4F51553079A0BAE0001D0D0 /* banner.cpp */,
2290A0FB09302D7500B7D80C /* cursor.cpp */,
C4F51554079A0BAE0001D0D0 /* label.cpp */,
+ 644D23540CDFE82D00E7F291 /* lightbarmenu.cpp */,
2290A0FC09302D7500B7D80C /* pointerArrow.cpp */,
6444BEE50932A3D700A29768 /* texturetile.cpp */,
);
@@ -1039,7 +1039,6 @@
C4F5155B079A0BDD0001D0D0 /* gl */ = {
isa = PBXGroup;
children = (
- 644D23560CDFE83C00E7F291 /* lightbarmenu.h */,
C4F51568079A0C480001D0D0 /* anims */,
C4F51569079A0C4E0001D0D0 /* drawables */,
C4F5156A079A0C560001D0D0 /* triggers */,
@@ -1059,11 +1058,11 @@
C4F51568079A0C480001D0D0 /* anims */ = {
isa = PBXGroup;
children = (
+ C4F5156B079A0C6C0001D0D0 /* alphafader.h */,
640C2C2F092EB8C40032DE40 /* alpharotate.h */,
- 64D758F3092EB9A5002667EE /* sleep.h */,
- C4F5156B079A0C6C0001D0D0 /* alphafader.h */,
C4F5156C079A0C6C0001D0D0 /* expxymover.h */,
C4F5156D079A0C6C0001D0D0 /* logxymover.h */,
+ 64D758F3092EB9A5002667EE /* sleep.h */,
C4F5156E079A0C6C0001D0D0 /* tintfader.h */,
);
name = anims;
@@ -1072,13 +1071,14 @@
C4F51569079A0C4E0001D0D0 /* drawables */ = {
isa = PBXGroup;
children = (
+ C4F5156F079A0C7D0001D0D0 /* banner.h */,
223226820A165A7A0035025E /* console.h */,
- 6444BEE70932A3F200A29768 /* texturetile.h */,
2290A0FF09302D9F00B7D80C /* cursor.h */,
- 2290A10009302D9F00B7D80C /* pointerArrow.h */,
- C4F5156F079A0C7D0001D0D0 /* banner.h */,
C4F51570079A0C7D0001D0D0 /* label.h */,
C4ACBDA00837CF6400FA287E /* layer.h */,
+ 644D23560CDFE83C00E7F291 /* lightbarmenu.h */,
+ 2290A10009302D9F00B7D80C /* pointerArrow.h */,
+ 6444BEE70932A3F200A29768 /* texturetile.h */,
);
name = drawables;
sourceTree = "<group>";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
