Archive/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-08 11:37:53 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deal with some clang-inspired buglets.

Browse source 
Respect the initial fullscreen setting in nowx.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7089 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-02-06 01:56:45 +00:00
parent 35edf1b236
commit 0f7ff9c23e
9 changed files with 284 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/Core/Core/Src/Core.cpp
View file

@ -193,14 +193,14 @@ void Stop() // - Hammertime!
g_bStopping = true; g_bStopping = true;
g_video_backend->EmuStateChange(EMUSTATE_CHANGE_STOP); g_video_backend->EmuStateChange(EMUSTATE_CHANGE_STOP);
WARN_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutting down ----"); INFO_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutting down ----");
Host_SetWaitCursor(true); // hourglass! Host_SetWaitCursor(true); // hourglass!
if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN) if (PowerPC::GetState() == PowerPC::CPU_POWERDOWN)
return; return;
// Stop the CPU // Stop the CPU
WARN_LOG(CONSOLE, "%s", StopMessage(true, "Stop CPU").c_str()); INFO_LOG(CONSOLE, "%s", StopMessage(true, "Stop CPU").c_str());
PowerPC::Stop(); PowerPC::Stop();
CCPU::StepOpcode(); // Kick it if it's waiting (code stepping wait loop) CCPU::StepOpcode(); // Kick it if it's waiting (code stepping wait loop)
@ -225,7 +225,7 @@ void Stop() // - Hammertime!
// Update mouse pointer // Update mouse pointer
Host_SetWaitCursor(false); Host_SetWaitCursor(false);
WARN_LOG(CONSOLE, "%s", StopMessage(true, "Stopping Emu thread ...").c_str()); INFO_LOG(CONSOLE, "%s", StopMessage(true, "Stopping Emu thread ...").c_str());
g_EmuThread.join(); // Wait for emuthread to close. g_EmuThread.join(); // Wait for emuthread to close.
} }

3
Source/Core/DolphinWX/Src/CheatsWindow.cpp
View file

@ -488,7 +488,8 @@ void CheatSearchTab::UpdateCheatSearchResultsList()
{ {
lbox_search_results->Clear(); lbox_search_results->Clear();
wxString count_label = _("Count:") + wxString::Format(wxT(" %i"), search_results.size()); wxString count_label = _("Count:") + wxString::Format(wxT(" %lu"),
(unsigned long)search_results.size());
if (search_results.size() > MAX_CHEAT_SEARCH_RESULTS_DISPLAY) if (search_results.size() > MAX_CHEAT_SEARCH_RESULTS_DISPLAY)
{ {
count_label += _(" (too many to display)"); count_label += _(" (too many to display)");

22
Source/Core/DolphinWX/Src/MemcardManager.cpp
View file

@ -97,10 +97,6 @@ BEGIN_EVENT_TABLE(CMemcardManager, wxDialog)
EVT_MENU_RANGE(COLUMN_BANNER, NUMBER_OF_COLUMN, CMemcardManager::OnMenuChange) EVT_MENU_RANGE(COLUMN_BANNER, NUMBER_OF_COLUMN, CMemcardManager::OnMenuChange)
END_EVENT_TABLE() END_EVENT_TABLE()
BEGIN_EVENT_TABLE(CMemcardManager::CMemcardListCtrl, wxListCtrl)
EVT_RIGHT_DOWN(CMemcardManager::CMemcardListCtrl::OnRightClick)
END_EVENT_TABLE()
CMemcardManager::CMemcardManager(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style) CMemcardManager::CMemcardManager(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style)
: wxDialog(parent, id, title, position, size, style) : wxDialog(parent, id, title, position, size, style)
{ {
@ -111,7 +107,7 @@ CMemcardManager::CMemcardManager(wxWindow* parent, wxWindowID id, const wxString
{ {
itemsPerPage = 16; itemsPerPage = 16;
mcmSettings.usePages = true; mcmSettings.usePages = true;
for (int i = 0; i < NUMBER_OF_COLUMN; i++) for (int i = COLUMN_BANNER; i < NUMBER_OF_COLUMN; i++)
{ {
mcmSettings.column[i] = (i <= COLUMN_FIRSTBLOCK)? true:false; mcmSettings.column[i] = (i <= COLUMN_FIRSTBLOCK)? true:false;
} }
@ -191,7 +187,7 @@ void CMemcardManager::CreateGUIControls()
m_ConvertToGci = new wxButton(this, ID_CONVERTTOGCI, _("Convert to GCI")); m_ConvertToGci = new wxButton(this, ID_CONVERTTOGCI, _("Convert to GCI"));
for (int slot = SLOT_A; slot < SLOT_B + 1; slot++) for (int slot = SLOT_A; slot <= SLOT_B; slot++)
{ {
m_CopyFrom[slot] = new wxButton(this, ID_COPYFROM_A + slot, m_CopyFrom[slot] = new wxButton(this, ID_COPYFROM_A + slot,
wxString::Format(_("%1$sCopy%1$s"), ARROW[slot ? 0 : 1])); wxString::Format(_("%1$sCopy%1$s"), ARROW[slot ? 0 : 1]));
@ -256,7 +252,7 @@ void CMemcardManager::CreateGUIControls()
Fit(); Fit();
Center(); Center();
for (int i = SLOT_A; i < SLOT_B + 1; i++) for (int i = SLOT_A; i <= SLOT_B; i++)
{ {
m_PrevPage[i]->Disable(); m_PrevPage[i]->Disable();
m_NextPage[i]->Disable(); m_NextPage[i]->Disable();
@ -274,7 +270,7 @@ void CMemcardManager::CreateGUIControls()
void CMemcardManager::OnClose(wxCloseEvent& WXUNUSED (event)) void CMemcardManager::OnClose(wxCloseEvent& WXUNUSED (event))
{ {
Close(); EndModal(wxID_OK);
} }
void CMemcardManager::OnPathChange(wxFileDirPickerEvent& event) void CMemcardManager::OnPathChange(wxFileDirPickerEvent& event)
@ -758,7 +754,7 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card)
delete[] images; delete[] images;
// Automatic column width and then show the list // Automatic column width and then show the list
for (int i = 0; i < NUMBER_OF_COLUMN; i++) for (int i = COLUMN_BANNER; i <= COLUMN_FIRSTBLOCK; i++)
{ {
if (mcmSettings.column[i]) if (mcmSettings.column[i])
m_MemcardList[card]->SetColumnWidth(i, wxLIST_AUTOSIZE); m_MemcardList[card]->SetColumnWidth(i, wxLIST_AUTOSIZE);
@ -767,7 +763,7 @@ bool CMemcardManager::ReloadMemcard(const char *fileName, int card)
} }
m_MemcardList[card]->Show(); m_MemcardList[card]->Show();
wxLabel.Printf(_("%d Free Blocks; %d Free Dir Entries"), wxLabel.Printf(_("%u Free Blocks; %u Free Dir Entries"),
memoryCard[card]->GetFreeBlocks(), DIRLEN - nFiles); memoryCard[card]->GetFreeBlocks(), DIRLEN - nFiles);
t_Status[card]->SetLabel(wxLabel); t_Status[card]->SetLabel(wxLabel);
@ -812,13 +808,15 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event)
popupMenu->AppendSeparator(); popupMenu->AppendSeparator();
popupMenu->AppendCheckItem(COLUMN_BANNER, _("Show save banner")); // popupMenu->AppendCheckItem(COLUMN_BANNER, _("Show save banner"));
popupMenu->AppendCheckItem(COLUMN_TITLE, _("Show save title")); popupMenu->AppendCheckItem(COLUMN_TITLE, _("Show save title"));
popupMenu->AppendCheckItem(COLUMN_COMMENT, _("Show save comment")); popupMenu->AppendCheckItem(COLUMN_COMMENT, _("Show save comment"));
popupMenu->AppendCheckItem(COLUMN_ICON, _("Show save icon")); popupMenu->AppendCheckItem(COLUMN_ICON, _("Show save icon"));
popupMenu->AppendCheckItem(COLUMN_BLOCKS, _("Show save blocks")); popupMenu->AppendCheckItem(COLUMN_BLOCKS, _("Show save blocks"));
popupMenu->AppendCheckItem(COLUMN_FIRSTBLOCK, _("Show first block"));
for (int i = COLUMN_BANNER; i <= COLUMN_BLOCKS; i++) // for (int i = COLUMN_BANNER; i <= COLUMN_FIRSTBLOCK; i++)
for (int i = COLUMN_TITLE; i <= COLUMN_FIRSTBLOCK; i++)
{ {
popupMenu->FindItem(i)->Check(__mcmSettings.column[i]); popupMenu->FindItem(i)->Check(__mcmSettings.column[i]);
} }

29
Source/Core/DolphinWX/Src/MemcardManager.h
View file

@ -137,22 +137,35 @@ class CMemcardManager : public wxDialog
struct _mcmSettings struct _mcmSettings
{ {
bool twoCardsLoaded, bool twoCardsLoaded;
usePages, bool usePages;
column[NUMBER_OF_COLUMN+1]; bool column[NUMBER_OF_COLUMN + 1];
}mcmSettings; } mcmSettings;
class CMemcardListCtrl : public wxListCtrl class CMemcardListCtrl : public wxListCtrl
{ {
//BEGIN_EVENT_TABLE(CMemcardManager::CMemcardListCtrl, wxListCtrl)
// EVT_RIGHT_DOWN(CMemcardManager::CMemcardListCtrl::OnRightClick)
//END_EVENT_TABLE()
public: public:
CMemcardListCtrl(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style, _mcmSettings& _mcmSetngs) CMemcardListCtrl(wxWindow* parent, const wxWindowID id,
: wxListCtrl(parent, id, pos, size, style), __mcmSettings(_mcmSetngs){;} const wxPoint& pos, const wxSize& size,
~CMemcardListCtrl(){;} long style, _mcmSettings& _mcmSetngs)
: wxListCtrl(parent, id, pos, size, style)
, __mcmSettings(_mcmSetngs)
{
Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(
CMemcardListCtrl::OnRightClick));
}
~CMemcardListCtrl()
{
Disconnect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(
CMemcardListCtrl::OnRightClick));
}
_mcmSettings & __mcmSettings; _mcmSettings & __mcmSettings;
bool prevPage, bool prevPage,
nextPage; nextPage;
private: private:
DECLARE_EVENT_TABLE()
void OnRightClick(wxMouseEvent& event); void OnRightClick(wxMouseEvent& event);
}; };

400
Source/Core/VideoCommon/Src/LightingShaderGen.cpp
View file

@ -1,200 +1,200 @@
// Copyright (C) 2003 Dolphin Project. // Copyright (C) 2003 Dolphin Project.
// This program is free software: you can redistribute it and/or modify // This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, version 2.0. // the Free Software Foundation, version 2.0.
// This program is distributed in the hope that it will be useful, // This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License 2.0 for more details. // GNU General Public License 2.0 for more details.
// A copy of the GPL 2.0 should have been included with the program. // A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/ // If not, see http://www.gnu.org/licenses/
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "LightingShaderGen.h" #include "LightingShaderGen.h"
#include "NativeVertexFormat.h" #include "NativeVertexFormat.h"
#include "XFMemory.h" #include "XFMemory.h"
#define WRITE p+=sprintf #define WRITE p+=sprintf
// coloralpha - 1 if color, 2 if alpha // coloralpha - 1 if color, 2 if alpha
char *GenerateLightShader(char *p, int index, const LitChannel& chan, const char* lightsName, int coloralpha) char *GenerateLightShader(char *p, int index, const LitChannel& chan, const char* lightsName, int coloralpha)
{ {
const char* swizzle = "xyzw"; const char* swizzle = "xyzw";
if (coloralpha == 1 ) swizzle = "xyz"; if (coloralpha == 1 ) swizzle = "xyz";
else if (coloralpha == 2 ) swizzle = "w"; else if (coloralpha == 2 ) swizzle = "w";
if (!(chan.attnfunc & 1)) { if (!(chan.attnfunc & 1)) {
// atten disabled // atten disabled
switch (chan.diffusefunc) { switch (chan.diffusefunc) {
case LIGHTDIF_NONE: case LIGHTDIF_NONE:
WRITE(p, "lacc.%s += %s.lights[%d].col.%s;\n", swizzle, lightsName, index, swizzle); WRITE(p, "lacc.%s += %s.lights[%d].col.%s;\n", swizzle, lightsName, index, swizzle);
break; break;
case LIGHTDIF_SIGN: case LIGHTDIF_SIGN:
case LIGHTDIF_CLAMP: case LIGHTDIF_CLAMP:
WRITE(p, "ldir = normalize(%s.lights[%d].pos.xyz - pos.xyz);\n", lightsName, index); WRITE(p, "ldir = normalize(%s.lights[%d].pos.xyz - pos.xyz);\n", lightsName, index);
WRITE(p, "lacc.%s += %sdot(ldir, _norm0)) * %s.lights[%d].col.%s;\n", WRITE(p, "lacc.%s += %sdot(ldir, _norm0)) * %s.lights[%d].col.%s;\n",
swizzle, chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(", lightsName, index, swizzle); swizzle, chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(", lightsName, index, swizzle);
break; break;
default: _assert_(0); default: _assert_(0);
} }
} }
else { // spec and spot else { // spec and spot
if (chan.attnfunc == 3) if (chan.attnfunc == 3)
{ // spot { // spot
WRITE(p, "ldir = %s.lights[%d].pos.xyz - pos.xyz;\n", lightsName, index); WRITE(p, "ldir = %s.lights[%d].pos.xyz - pos.xyz;\n", lightsName, index);
WRITE(p, "dist2 = dot(ldir, ldir);\n" WRITE(p, "dist2 = dot(ldir, ldir);\n"
"dist = sqrt(dist2);\n" "dist = sqrt(dist2);\n"
"ldir = ldir / dist;\n" "ldir = ldir / dist;\n"
"attn = max(0.0f, dot(ldir, %s.lights[%d].dir.xyz));\n", lightsName, index); "attn = max(0.0f, dot(ldir, %s.lights[%d].dir.xyz));\n", lightsName, index);
WRITE(p, "attn = max(0.0f, dot(%s.lights[%d].cosatt.xyz, float3(1.0f, attn, attn*attn))) / dot(%s.lights[%d].distatt.xyz, float3(1.0f,dist,dist2));\n", lightsName, index, lightsName, index); WRITE(p, "attn = max(0.0f, dot(%s.lights[%d].cosatt.xyz, float3(1.0f, attn, attn*attn))) / dot(%s.lights[%d].distatt.xyz, float3(1.0f,dist,dist2));\n", lightsName, index, lightsName, index);
} }
else if (chan.attnfunc == 1) else if (chan.attnfunc == 1)
{ // specular { // specular
WRITE(p, "ldir = normalize(%s.lights[%d].pos.xyz);\n", lightsName, index); WRITE(p, "ldir = normalize(%s.lights[%d].pos.xyz);\n", lightsName, index);
WRITE(p, "attn = (dot(_norm0,ldir) >= 0.0f) ? max(0.0f, dot(_norm0, %s.lights[%d].dir.xyz)) : 0.0f;\n", lightsName, index); WRITE(p, "attn = (dot(_norm0,ldir) >= 0.0f) ? max(0.0f, dot(_norm0, %s.lights[%d].dir.xyz)) : 0.0f;\n", lightsName, index);
WRITE(p, "attn = max(0.0f, dot(%s.lights[%d].cosatt.xyz, float3(1,attn,attn*attn))) / dot(%s.lights[%d].distatt.xyz, float3(1,attn,attn*attn));\n", lightsName, index, lightsName, index); WRITE(p, "attn = max(0.0f, dot(%s.lights[%d].cosatt.xyz, float3(1,attn,attn*attn))) / dot(%s.lights[%d].distatt.xyz, float3(1,attn,attn*attn));\n", lightsName, index, lightsName, index);
} }
switch (chan.diffusefunc) switch (chan.diffusefunc)
{ {
case LIGHTDIF_NONE: case LIGHTDIF_NONE:
WRITE(p, "lacc.%s += attn * %s.lights[%d].col.%s;\n", swizzle, lightsName, index, swizzle); WRITE(p, "lacc.%s += attn * %s.lights[%d].col.%s;\n", swizzle, lightsName, index, swizzle);
break; break;
case LIGHTDIF_SIGN: case LIGHTDIF_SIGN:
case LIGHTDIF_CLAMP: case LIGHTDIF_CLAMP:
WRITE(p, "lacc.%s += attn * %sdot(ldir, _norm0)) * %s.lights[%d].col.%s;\n", WRITE(p, "lacc.%s += attn * %sdot(ldir, _norm0)) * %s.lights[%d].col.%s;\n",
swizzle, swizzle,
chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(", chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(",
lightsName, lightsName,
index, index,
swizzle); swizzle);
break; break;
default: _assert_(0); default: _assert_(0);
} }
} }
WRITE(p, "\n"); WRITE(p, "\n");
return p; return p;
} }
// vertex shader // vertex shader
// lights/colors // lights/colors
// materials name is I_MATERIALS in vs and I_PMATERIALS in ps // materials name is I_MATERIALS in vs and I_PMATERIALS in ps
// inColorName is color in vs and colors_ in ps // inColorName is color in vs and colors_ in ps
// dest is o.colors_ in vs and colors_ in ps // dest is o.colors_ in vs and colors_ in ps
char *GenerateLightingShader(char *p, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest) char *GenerateLightingShader(char *p, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest)
{ {
for (unsigned int j = 0; j < xfregs.numChan.numColorChans; j++) for (unsigned int j = 0; j < xfregs.numChan.numColorChans; j++)
{ {
const LitChannel& color = xfregs.color[j]; const LitChannel& color = xfregs.color[j];
const LitChannel& alpha = xfregs.alpha[j]; const LitChannel& alpha = xfregs.alpha[j];
WRITE(p, "{\n"); WRITE(p, "{\n");
if (color.matsource) {// from vertex if (color.matsource) {// from vertex
if (components & (VB_HAS_COL0 << j)) if (components & (VB_HAS_COL0 << j))
WRITE(p, "mat = %s%d;\n", inColorName, j); WRITE(p, "mat = %s%d;\n", inColorName, j);
else if (components & VB_HAS_COL0) else if (components & VB_HAS_COL0)
WRITE(p, "mat = %s0;\n", inColorName); WRITE(p, "mat = %s0;\n", inColorName);
else else
WRITE(p, "mat = float4(1.0f, 1.0f, 1.0f, 1.0f);\n"); WRITE(p, "mat = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
} }
else // from color else // from color
WRITE(p, "mat = %s.C%d;\n", materialsName, j+2); WRITE(p, "mat = %s.C%d;\n", materialsName, j+2);
if (color.enablelighting) { if (color.enablelighting) {
if (color.ambsource) { // from vertex if (color.ambsource) { // from vertex
if (components & (VB_HAS_COL0<<j) ) if (components & (VB_HAS_COL0<<j) )
WRITE(p, "lacc = %s%d;\n", inColorName, j); WRITE(p, "lacc = %s%d;\n", inColorName, j);
else if (components & VB_HAS_COL0 ) else if (components & VB_HAS_COL0 )
WRITE(p, "lacc = %s0;\n", inColorName); WRITE(p, "lacc = %s0;\n", inColorName);
else else
WRITE(p, "lacc = float4(0.0f, 0.0f, 0.0f, 0.0f);\n"); WRITE(p, "lacc = float4(0.0f, 0.0f, 0.0f, 0.0f);\n");
} }
else // from color else // from color
WRITE(p, "lacc = %s.C%d;\n", materialsName, j); WRITE(p, "lacc = %s.C%d;\n", materialsName, j);
} }
else else
{ {
WRITE(p, "lacc = float4(1.0f, 1.0f, 1.0f, 1.0f);\n"); WRITE(p, "lacc = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
} }
// check if alpha is different // check if alpha is different
if (alpha.matsource != color.matsource) { if (alpha.matsource != color.matsource) {
if (alpha.matsource) {// from vertex if (alpha.matsource) {// from vertex
if (components & (VB_HAS_COL0<<j)) if (components & (VB_HAS_COL0<<j))
WRITE(p, "mat.w = %s%d.w;\n", inColorName, j); WRITE(p, "mat.w = %s%d.w;\n", inColorName, j);
else if (components & VB_HAS_COL0) else if (components & VB_HAS_COL0)
WRITE(p, "mat.w = %s0.w;\n", inColorName); WRITE(p, "mat.w = %s0.w;\n", inColorName);
else WRITE(p, "mat.w = 1.0f;\n"); else WRITE(p, "mat.w = 1.0f;\n");
} }
else // from color else // from color
WRITE(p, "mat.w = %s.C%d.w;\n", materialsName, j+2); WRITE(p, "mat.w = %s.C%d.w;\n", materialsName, j+2);
} }
if (alpha.enablelighting) if (alpha.enablelighting)
{ {
if (alpha.ambsource) {// from vertex if (alpha.ambsource) {// from vertex
if (components & (VB_HAS_COL0<<j) ) if (components & (VB_HAS_COL0<<j) )
WRITE(p, "lacc.w = %s%d.w;\n", inColorName, j); WRITE(p, "lacc.w = %s%d.w;\n", inColorName, j);
else if (components & VB_HAS_COL0 ) else if (components & VB_HAS_COL0 )
WRITE(p, "lacc.w = %s0.w;\n", inColorName); WRITE(p, "lacc.w = %s0.w;\n", inColorName);
else else
WRITE(p, "lacc.w = 0.0f;\n"); WRITE(p, "lacc.w = 0.0f;\n");
} }
else // from color else // from color
WRITE(p, "lacc.w = %s.C%d.w;\n", materialsName, j); WRITE(p, "lacc.w = %s.C%d.w;\n", materialsName, j);
} }
else else
{ {
WRITE(p, "lacc.w = 1.0f;\n"); WRITE(p, "lacc.w = 1.0f;\n");
} }
if(color.enablelighting && alpha.enablelighting) if(color.enablelighting && alpha.enablelighting)
{ {
// both have lighting, test if they use the same lights // both have lighting, test if they use the same lights
int mask = 0; int mask = 0;
if(color.lightparams == alpha.lightparams) if(color.lightparams == alpha.lightparams)
{ {
mask = color.GetFullLightMask() & alpha.GetFullLightMask(); mask = color.GetFullLightMask() & alpha.GetFullLightMask();
if(mask) if(mask)
{ {
for (int i = 0; i < 8; ++i) for (int i = 0; i < 8; ++i)
{ {
if (mask & (1<<i)) if (mask & (1<<i))
p = GenerateLightShader(p, i, color, lightsName, 3); p = GenerateLightShader(p, i, color, lightsName, 3);
} }
} }
} }
// no shared lights // no shared lights
for (int i = 0; i < 8; ++i) for (int i = 0; i < 8; ++i)
{ {
if (!(mask&(1<<i)) && (color.GetFullLightMask() & (1<<i))) if (!(mask&(1<<i)) && (color.GetFullLightMask() & (1<<i)))
p = GenerateLightShader(p, i, color, lightsName, 1); p = GenerateLightShader(p, i, color, lightsName, 1);
if (!(mask&(1<<i)) && (alpha.GetFullLightMask() & (1<<i))) if (!(mask&(1<<i)) && (alpha.GetFullLightMask() & (1<<i)))
p = GenerateLightShader(p, i, alpha, lightsName, 2); p = GenerateLightShader(p, i, alpha, lightsName, 2);
} }
} }
else if (color.enablelighting || alpha.enablelighting) else if (color.enablelighting || alpha.enablelighting)
{ {
// lights are disabled on one channel so process only the active ones // lights are disabled on one channel so process only the active ones
const LitChannel& workingchannel = color.enablelighting ? color : alpha; const LitChannel& workingchannel = color.enablelighting ? color : alpha;
int coloralpha = color.enablelighting ? 1 : 2; int coloralpha = color.enablelighting ? 1 : 2;
for (int i = 0; i < 8; ++i) for (int i = 0; i < 8; ++i)
{ {
if (workingchannel.GetFullLightMask() & (1<<i)) if (workingchannel.GetFullLightMask() & (1<<i))
p = GenerateLightShader(p, i, workingchannel, lightsName, coloralpha); p = GenerateLightShader(p, i, workingchannel, lightsName, coloralpha);
} }
} }
WRITE(p, "%s%d = mat * saturate(lacc);\n", dest, j); WRITE(p, "%s%d = mat * saturate(lacc);\n", dest, j);
WRITE(p, "}\n"); WRITE(p, "}\n");
} }
return p; return p;
} }

46
Source/Core/VideoCommon/Src/LightingShaderGen.h
View file

@ -1,23 +1,23 @@
// Copyright (C) 2003 Dolphin Project. // Copyright (C) 2003 Dolphin Project.
// This program is free software: you can redistribute it and/or modify // This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, version 2.0. // the Free Software Foundation, version 2.0.
// This program is distributed in the hope that it will be useful, // This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License 2.0 for more details. // GNU General Public License 2.0 for more details.
// A copy of the GPL 2.0 should have been included with the program. // A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/ // If not, see http://www.gnu.org/licenses/
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#ifndef _LIGHTINGSHADERGEN_H_ #ifndef _LIGHTINGSHADERGEN_H_
#define _LIGHTINGSHADERGEN_H_ #define _LIGHTINGSHADERGEN_H_
char *GenerateLightingShader(char *p, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest); char *GenerateLightingShader(char *p, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest);
#endif // _LIGHTINGSHADERGEN_H_ #endif // _LIGHTINGSHADERGEN_H_

30
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View file

@ -338,6 +338,8 @@ bool OpenGL_Create(int _iwidth, int _iheight)
GLWin.glCtxt = new wxGLContext(GLWin.glCanvas); GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
#elif defined(__APPLE__) #elif defined(__APPLE__)
NSRect size;
NSUInteger style = NSMiniaturizableWindowMask;
NSOpenGLPixelFormatAttribute attr[2] = { NSOpenGLPFADoubleBuffer, 0 }; NSOpenGLPixelFormatAttribute attr[2] = { NSOpenGLPFADoubleBuffer, 0 };
NSOpenGLPixelFormat *fmt = [[NSOpenGLPixelFormat alloc] NSOpenGLPixelFormat *fmt = [[NSOpenGLPixelFormat alloc]
initWithAttributes: attr]; initWithAttributes: attr];
@ -354,15 +356,29 @@ bool OpenGL_Create(int _iwidth, int _iheight)
return NULL; return NULL;
} }
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen) {
size = [[NSScreen mainScreen] frame];
style |= NSBorderlessWindowMask;
} else {
size = NSMakeRect(_tx, _ty, _twidth, _theight);
style |= NSResizableWindowMask | NSTitledWindowMask;
}
(void)VideoWindowHandle; (void)VideoWindowHandle;
CGDisplayCapture(CGMainDisplayID()); GLWin.cocoaWin = [[NSWindow alloc] initWithContentRect: size
GLWin.cocoaWin = [[NSWindow alloc] styleMask: style backing: NSBackingStoreBuffered defer: NO];
initWithContentRect: [[NSScreen mainScreen] frame] if (GLWin.cocoaWin == nil) {
styleMask: NSBorderlessWindowMask ERROR_LOG(VIDEO, "failed to create window");
backing: NSBackingStoreBuffered defer: NO]; return NULL;
[GLWin.cocoaWin makeKeyAndOrderFront: nil]; }
[GLWin.cocoaWin setLevel: CGShieldingWindowLevel()];
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen) {
CGDisplayCapture(CGMainDisplayID());
[GLWin.cocoaWin setLevel: CGShieldingWindowLevel()];
}
[GLWin.cocoaCtx setView: [GLWin.cocoaWin contentView]]; [GLWin.cocoaCtx setView: [GLWin.cocoaWin contentView]];
[GLWin.cocoaWin makeKeyAndOrderFront: nil];
#elif defined(_WIN32) #elif defined(_WIN32)
VideoWindowHandle() = (void*)EmuWindow::Create((HWND)VideoWindowHandle(), GetModuleHandle(0), _T("Please wait...")); VideoWindowHandle() = (void*)EmuWindow::Create((HWND)VideoWindowHandle(), GetModuleHandle(0), _T("Please wait..."));

2
Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
View file

@ -133,7 +133,7 @@ inline s16 Clamp1024(s16 in)
return in>1023?1023:(in<-1024?-1024:in); return in>1023?1023:(in<-1024?-1024:in);
} }
inline void Tev::SetRasColor(int colorChan, int swaptable) void Tev::SetRasColor(int colorChan, int swaptable)
{ {
switch(colorChan) switch(colorChan)
{ {

2
Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.cpp
View file

@ -116,7 +116,7 @@ void TransformNormal(const InputVertexData *src, bool nbt, OutputVertexData *dst
} }
} }
inline void TransformTexCoordRegular(const TexMtxInfo &texinfo, int coordNum, bool specialCase, const InputVertexData *srcVertex, OutputVertexData *dstVertex) void TransformTexCoordRegular(const TexMtxInfo &texinfo, int coordNum, bool specialCase, const InputVertexData *srcVertex, OutputVertexData *dstVertex)
{ {
const Vec3 *src; const Vec3 *src;
switch (texinfo.sourcerow) switch (texinfo.sourcerow)