fix for linux

This commit is contained in:
Rodolfo Bogado 2016-06-22 22:49:53 -03:00
parent 4ba67d54f3
commit 2b9173f6ca
4 changed files with 82 additions and 81 deletions

View file

@ -2022,7 +2022,7 @@ void BloomMerger()
if (OptionEnabled(C_GAUSSIAN_ANAMFLARE))
{
float3 anamflare = blur.a * GetOption(C_ANAMFLARE_COLOR).rgb * lumColor.rgb;
mergedcolor.rgb += pow(anamflare.rgb, 1.0 / GetOption(B_ANAMFLARE_CURVE));
mergedcolor.rgb += pow(anamflare.rgb, float3(1.0, 1.0, 1.0) / (float3(1.0,1.0,1.0) * GetOption(B_ANAMFLARE_CURVE)));
}
SetOutput(mergedcolor);
}
@ -2100,4 +2100,4 @@ void Barrel_distortion() {
{
SetOutput(SamplePrevLocation(actualTextureCoords));
}
}
}

View file

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Dolphin Emulator\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-15 20:30+0000\n"
"POT-Creation-Date: 2016-05-30 20:46+0000\n"
"PO-Revision-Date: 2016-05-09 20:51+0000\n"
"Last-Translator: dolphinbot <delroth@dolphin-emu.org>\n"
"Language-Team: Hebrew (http://www.transifex.com/delroth/dolphin-emu/language/"
@ -475,7 +475,7 @@ msgstr ""
msgid "<Nothing>"
msgstr ""
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:73
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:76
msgid "<System Language>"
msgstr ""
@ -943,9 +943,9 @@ msgstr ""
msgid "Buffer:"
msgstr ""
#: Source/Core/DolphinWX/TASInputDlg.cpp:133
#: Source/Core/DolphinWX/TASInputDlg.cpp:247
#: Source/Core/DolphinWX/TASInputDlg.cpp:347
#: Source/Core/DolphinWX/TASInputDlg.cpp:140
#: Source/Core/DolphinWX/TASInputDlg.cpp:265
#: Source/Core/DolphinWX/TASInputDlg.cpp:365
#: Source/Core/Core/HW/GCPadEmu.cpp:60
msgid "Buttons"
msgstr ""
@ -960,7 +960,7 @@ msgid ""
"this option disabled."
msgstr ""
#: Source/Core/DolphinWX/TASInputDlg.cpp:331
#: Source/Core/DolphinWX/TASInputDlg.cpp:349
#: Source/Core/Core/HW/GCPadEmu.cpp:66
msgid "C Stick"
msgstr ""
@ -999,7 +999,7 @@ msgid ""
"If unsure, leave this unchecked."
msgstr ""
#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1868
#: Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp:1870
#, c-format
msgid "Can't find Wiimote by connection handle %02x"
msgstr ""
@ -1045,12 +1045,12 @@ msgstr ""
msgid "Change Game"
msgstr ""
#: Source/Core/Core/Movie.cpp:1138
#: Source/Core/Core/Movie.cpp:1183
#, c-format
msgid "Change the disc to %s"
msgstr ""
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:118
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:126
msgid ""
"Change the language of the user interface.\n"
"Requires restart."
@ -1229,7 +1229,7 @@ msgstr ""
msgid "Confirm File Overwrite"
msgstr ""
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:100
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:108
msgid "Confirm on Stop"
msgstr ""
@ -1276,7 +1276,7 @@ msgstr ""
msgid "Connected"
msgstr ""
#: Source/Core/DolphinWX/Main.cpp:492
#: Source/Core/DolphinWX/Main.cpp:517
msgid "Connecting..."
msgstr ""
@ -1386,11 +1386,11 @@ msgid ""
"options."
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:74
#: Source/Core/Core/NetPlayClient.cpp:77
msgid "Couldn't Create Client"
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:85
#: Source/Core/Core/NetPlayClient.cpp:88
msgid "Couldn't create peer."
msgstr ""
@ -1691,7 +1691,7 @@ msgstr ""
msgid "Display"
msgstr ""
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:116
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:124
msgid ""
"Display messages over the emulation screen area.\n"
"These messages include memory card writes, video backend and CPU "
@ -1904,7 +1904,7 @@ msgstr ""
msgid "Empty"
msgstr ""
#: Source/Core/Core/Core.cpp:220
#: Source/Core/Core/Core.cpp:232
msgid "Emu Thread already running"
msgstr ""
@ -2107,7 +2107,7 @@ msgstr ""
msgid "Equal"
msgstr ""
#: Source/Core/DolphinWX/Main.cpp:329 Source/Core/DolphinWX/Main.cpp:335
#: Source/Core/DolphinWX/Main.cpp:331 Source/Core/DolphinWX/Main.cpp:337
#: Source/Core/DolphinWX/MemcardManager.cpp:566
#: Source/Core/DolphinWX/PatchAddEdit.cpp:229
#: Source/Core/DolphinWX/LogConfigWindow.cpp:43
@ -2115,7 +2115,7 @@ msgstr ""
msgid "Error"
msgstr ""
#: Source/Core/DolphinWX/Main.cpp:329
#: Source/Core/DolphinWX/Main.cpp:331
msgid "Error loading selected language. Falling back to system default."
msgstr ""
@ -2253,11 +2253,11 @@ msgstr ""
msgid "FST Size:"
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:156
#: Source/Core/Core/NetPlayClient.cpp:159
msgid "Failed To Connect!"
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:100
#: Source/Core/Core/NetPlayClient.cpp:103
msgid "Failed to Connect!"
msgstr ""
@ -2303,7 +2303,7 @@ msgid ""
"media can be written."
msgstr ""
#: Source/Core/Core/Movie.cpp:909
#: Source/Core/Core/Movie.cpp:944
#, c-format
msgid "Failed to read %s"
msgstr ""
@ -2379,7 +2379,7 @@ msgstr ""
msgid "Fast Depth Calculation"
msgstr ""
#: Source/Core/Core/Movie.cpp:1167
#: Source/Core/Core/Movie.cpp:1213
#, c-format
msgid ""
"Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s"
@ -2709,11 +2709,11 @@ msgstr ""
msgid "Game ID:"
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:693
#: Source/Core/Core/NetPlayClient.cpp:696
msgid "Game is already running!"
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:1009
#: Source/Core/Core/NetPlayClient.cpp:1029
msgid "Game isn't running!"
msgstr ""
@ -2885,7 +2885,7 @@ msgstr ""
msgid "Host Code :"
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:108
#: Source/Core/Core/NetPlayClient.cpp:111
msgid ""
"Host code size is to large.\n"
"Please recheck that you have the correct code"
@ -2930,7 +2930,7 @@ msgstr ""
msgid "IPL with unknown hash %x"
msgstr ""
#: Source/Core/DolphinWX/TASInputDlg.cpp:126
#: Source/Core/DolphinWX/TASInputDlg.cpp:133
#: Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp:267
msgid "IR"
msgstr ""
@ -3090,7 +3090,7 @@ msgstr ""
msgid "Interface"
msgstr ""
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:126
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:134
msgid "Interface Settings"
msgstr ""
@ -3129,7 +3129,7 @@ msgstr ""
msgid "Invalid bat.map or dir entry."
msgstr ""
#: Source/Core/Core/CoreTiming.cpp:499
#: Source/Core/Core/CoreTiming.cpp:496
#, c-format
msgid "Invalid event type %i"
msgstr ""
@ -3138,7 +3138,7 @@ msgstr ""
msgid "Invalid file"
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:828
#: Source/Core/Core/NetPlayClient.cpp:841
msgid "Invalid host"
msgstr ""
@ -3146,7 +3146,7 @@ msgstr ""
msgid "Invalid index"
msgstr ""
#: Source/Core/Core/Movie.cpp:851
#: Source/Core/Core/Movie.cpp:885
msgid "Invalid recording file"
msgstr ""
@ -3257,7 +3257,7 @@ msgstr ""
msgid "L-Analog"
msgstr ""
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:121
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:129
msgid "Language:"
msgstr ""
@ -3279,7 +3279,7 @@ msgstr ""
msgid "Left Stick"
msgstr ""
#: Source/Core/DolphinWX/TASInputDlg.cpp:235
#: Source/Core/DolphinWX/TASInputDlg.cpp:253
msgid "Left stick"
msgstr ""
@ -3481,7 +3481,7 @@ msgstr ""
msgid "Logging"
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:563
#: Source/Core/Core/NetPlayClient.cpp:566
msgid "Lost connection to server!"
msgstr ""
@ -3498,7 +3498,7 @@ msgstr ""
msgid "MadCatz Gameshark files(*.gcs)"
msgstr ""
#: Source/Core/DolphinWX/TASInputDlg.cpp:328
#: Source/Core/DolphinWX/TASInputDlg.cpp:346
msgid "Main Stick"
msgstr ""
@ -3764,7 +3764,7 @@ msgstr ""
msgid "Netherlands"
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:994
#: Source/Core/Core/NetPlayClient.cpp:1014
msgid "Netplay has desynced. There is no way to recover from this."
msgstr ""
@ -3828,7 +3828,7 @@ msgstr ""
msgid "Not Set"
msgstr ""
#: Source/Core/DolphinWX/Main.cpp:491
#: Source/Core/DolphinWX/Main.cpp:516
msgid "Not connected"
msgstr ""
@ -3856,11 +3856,11 @@ msgstr ""
msgid "Nunchuk"
msgstr ""
#: Source/Core/DolphinWX/TASInputDlg.cpp:178
#: Source/Core/DolphinWX/TASInputDlg.cpp:190
msgid "Nunchuk orientation"
msgstr ""
#: Source/Core/DolphinWX/TASInputDlg.cpp:173
#: Source/Core/DolphinWX/TASInputDlg.cpp:185
msgid "Nunchuk stick"
msgstr ""
@ -3885,7 +3885,7 @@ msgstr ""
msgid "Offset:"
msgstr ""
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:102
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:110
msgid "On-Screen Display Messages"
msgstr ""
@ -3953,7 +3953,7 @@ msgid ""
"and import the saves to a new memcard\n"
msgstr ""
#: Source/Core/DolphinWX/TASInputDlg.cpp:131
#: Source/Core/DolphinWX/TASInputDlg.cpp:138
msgid "Orientation"
msgstr ""
@ -3962,7 +3962,7 @@ msgstr ""
msgid "Other"
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:410
#: Source/Core/Core/NetPlayClient.cpp:413
msgid ""
"Other client disconnected while game is running!! NetPlay is disabled. You "
"must manually stop the game."
@ -4027,11 +4027,11 @@ msgstr ""
msgid "Pause at End of Movie"
msgstr ""
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:103
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:111
msgid "Pause on Focus Lost"
msgstr ""
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:117
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:125
msgid "Pauses the emulator when focus is taken away from the emulation window."
msgstr ""
@ -4109,17 +4109,17 @@ msgstr ""
msgid "Prefetch Custom Textures"
msgstr ""
#: Source/Core/Core/Movie.cpp:1058
#: Source/Core/Core/Movie.cpp:1095
#, c-format
msgid "Premature movie end in PlayController. %u + 8 > %u"
msgstr ""
#: Source/Core/Core/Movie.cpp:1177
#: Source/Core/Core/Movie.cpp:1223
#, c-format
msgid "Premature movie end in PlayWiimote. %u + %d > %u"
msgstr ""
#: Source/Core/Core/Movie.cpp:1156
#: Source/Core/Core/Movie.cpp:1202
#, c-format
msgid "Premature movie end in PlayWiimote. %u > %u"
msgstr ""
@ -4333,7 +4333,7 @@ msgstr ""
msgid "Right Stick"
msgstr ""
#: Source/Core/DolphinWX/TASInputDlg.cpp:236
#: Source/Core/DolphinWX/TASInputDlg.cpp:254
msgid "Right stick"
msgstr ""
@ -4446,7 +4446,7 @@ msgstr ""
msgid "Saved to /Wii/sd.raw (default size is 128mb)"
msgstr ""
#: Source/Core/Core/Movie.cpp:918
#: Source/Core/Core/Movie.cpp:953
#, c-format
msgid "Savestate movie %s is corrupted, movie recording stopping..."
msgstr ""
@ -4682,7 +4682,7 @@ msgid ""
"Serial Port 1 - This is the port which devices such as the net adapter use."
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:825
#: Source/Core/Core/NetPlayClient.cpp:838
msgid "Server rejected traversal attempt"
msgstr ""
@ -4729,8 +4729,8 @@ msgstr ""
msgid "Shake"
msgstr ""
#: Source/Core/DolphinWX/TASInputDlg.cpp:241
#: Source/Core/DolphinWX/TASInputDlg.cpp:333
#: Source/Core/DolphinWX/TASInputDlg.cpp:259
#: Source/Core/DolphinWX/TASInputDlg.cpp:351
msgid "Shoulder Buttons"
msgstr ""
@ -4862,11 +4862,11 @@ msgstr ""
msgid "Show World"
msgstr ""
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:114
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:122
msgid "Show a confirmation box before stopping a game."
msgstr ""
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:115
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:123
msgid ""
"Show a message box when a potentially serious error has occurred.\n"
"Disabling this may avoid annoying and non-fatal messages, but it may result "
@ -5300,7 +5300,7 @@ msgstr ""
msgid "The name cannot contain the character ','"
msgstr ""
#: Source/Core/Core/Movie.cpp:183
#: Source/Core/Core/Movie.cpp:195
#, c-format
msgid "The recorded game (%s) is not the same as the selected game (%s)"
msgstr ""
@ -5313,25 +5313,25 @@ msgstr ""
msgid "The save you are trying to copy has an invalid file size."
msgstr ""
#: Source/Core/DolphinWX/Main.cpp:335
#: Source/Core/DolphinWX/Main.cpp:337
msgid ""
"The selected language is not supported by your system. Falling back to "
"system default."
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:194
#: Source/Core/Core/NetPlayClient.cpp:197
msgid "The server and client's NetPlay versions are incompatible!"
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:191
#: Source/Core/Core/NetPlayClient.cpp:194
msgid "The server is full!"
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:197
#: Source/Core/Core/NetPlayClient.cpp:200
msgid "The server responded: the game is currently running!"
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:200
#: Source/Core/Core/NetPlayClient.cpp:203
msgid "The server sent an unknown error message!"
msgstr ""
@ -5344,7 +5344,7 @@ msgstr ""
msgid "The value is invalid"
msgstr ""
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:123
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:131
msgid "Theme:"
msgstr ""
@ -5515,7 +5515,7 @@ msgstr ""
msgid "Traversal Server:"
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:822
#: Source/Core/Core/NetPlayClient.cpp:835
msgid "Traversal server timed out connecting to the host"
msgstr ""
@ -5523,7 +5523,8 @@ msgstr ""
msgid "Traversal: "
msgstr ""
#: Source/Core/DiscIO/VolumeGC.cpp:36 Source/Core/DiscIO/VolumeDirectory.cpp:79
#: Source/Core/DiscIO/VolumeGC.cpp:36
#: Source/Core/DiscIO/VolumeDirectory.cpp:79
#: Source/Core/DiscIO/VolumeWad.cpp:49
msgid "Tried to decrypt data from a non-Wii volume"
msgstr ""
@ -5610,7 +5611,7 @@ msgstr ""
msgid "Unknown"
msgstr ""
#: Source/Core/Core/HW/DVDInterface.cpp:1252
#: Source/Core/Core/HW/DVDInterface.cpp:1251
#, c-format
msgid "Unknown DVD command %08x - fatal error"
msgstr ""
@ -5620,7 +5621,7 @@ msgstr ""
msgid "Unknown entry type %i in SYSCONF (%s@%x)!"
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:831
#: Source/Core/Core/NetPlayClient.cpp:844
#, c-format
msgid "Unknown error %x"
msgstr ""
@ -5630,7 +5631,7 @@ msgstr ""
msgid "Unknown memory card error"
msgstr ""
#: Source/Core/Core/NetPlayClient.cpp:481
#: Source/Core/Core/NetPlayClient.cpp:484
#, c-format
msgid "Unknown message received with id : %d"
msgstr ""
@ -5673,7 +5674,7 @@ msgstr ""
msgid "Use PAL60 Mode (EuRGB60)"
msgstr ""
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:101
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:109
msgid "Use Panic Handlers"
msgstr ""
@ -5806,7 +5807,7 @@ msgid ""
"Continue?"
msgstr ""
#: Source/Core/Core/Movie.cpp:964
#: Source/Core/Core/Movie.cpp:999
#, c-format
msgid ""
"Warning: You loaded a save that's after the end of the current movie. (byte "
@ -5814,7 +5815,7 @@ msgid ""
"load this state with read-only mode off."
msgstr ""
#: Source/Core/Core/Movie.cpp:941
#: Source/Core/Core/Movie.cpp:976
#, c-format
msgid ""
"Warning: You loaded a save whose movie ends before the current frame in the "
@ -5822,7 +5823,7 @@ msgid ""
"continuing."
msgstr ""
#: Source/Core/Core/Movie.cpp:981
#: Source/Core/Core/Movie.cpp:1016
#, c-format
msgid ""
"Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You "
@ -5830,7 +5831,7 @@ msgid ""
"only mode off. Otherwise you'll probably get a desync."
msgstr ""
#: Source/Core/Core/Movie.cpp:991
#: Source/Core/Core/Movie.cpp:1026
#, c-format
msgid ""
"Warning: You loaded a save whose movie mismatches on frame %d. You should "
@ -5908,7 +5909,7 @@ msgstr ""
msgid "Wiimote %i %s"
msgstr ""
#: Source/Core/DolphinWX/Main.cpp:493
#: Source/Core/DolphinWX/Main.cpp:518
msgid "Wiimote Connected"
msgstr ""
@ -5964,7 +5965,7 @@ msgstr ""
msgid "Write to memcards/SD"
msgstr ""
#: Source/Core/DolphinWX/TASInputDlg.cpp:430
#: Source/Core/DolphinWX/TASInputDlg.cpp:454
msgid "X"
msgstr ""
@ -5972,7 +5973,7 @@ msgstr ""
msgid "XF register "
msgstr ""
#: Source/Core/DolphinWX/TASInputDlg.cpp:431
#: Source/Core/DolphinWX/TASInputDlg.cpp:455
msgid "Y"
msgstr ""
@ -6000,7 +6001,7 @@ msgstr ""
msgid "You must enter a valid profile name."
msgstr ""
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:199
#: Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp:207
msgid "You must restart Dolphin in order for the change to take effect."
msgstr ""
@ -6025,7 +6026,7 @@ msgid ""
"Do you want to generate a new one?"
msgstr ""
#: Source/Core/DolphinWX/TASInputDlg.cpp:432
#: Source/Core/DolphinWX/TASInputDlg.cpp:456
msgid "Z"
msgstr ""

View file

@ -358,8 +358,8 @@ private:
pKey_t Id;
pKey_t usage_count;
};
std::unordered_map<Tobj, ObjectMetadata, TobjHasher> m_objects = {};;
std::map<TCaterogry, CategoryMetadata> m_categories = {};;
std::unordered_map<Tobj, ObjectMetadata, TobjHasher> m_objects;
std::map<TCaterogry, CategoryMetadata> m_categories;
pKey_t m_category_id = {};
pKey_t m_category_index = {};
pKey_t m_max_category_index = {};
@ -377,4 +377,4 @@ private:
{
in.read(reinterpret_cast<char*>(&t), sizeof(T));
}
};
};

View file

@ -1525,7 +1525,7 @@ void PostProcessor::GetUniformBufferShaderSource(API_TYPE api, const PostProcess
}
else if (it.second.m_type == POST_PROCESSING_OPTION_TYPE_INTEGER)
{
u32 count = static_cast<u32>(it.second.m_integer_values.size());
count = static_cast<u32>(it.second.m_integer_values.size());
if (count == 1)
shader_source += StringFromFormat("\tint o_%s;\n", it.first.c_str());
@ -1534,7 +1534,7 @@ void PostProcessor::GetUniformBufferShaderSource(API_TYPE api, const PostProcess
}
else if (it.second.m_type == POST_PROCESSING_OPTION_TYPE_FLOAT)
{
u32 count = static_cast<u32>(it.second.m_float_values.size());
count = static_cast<u32>(it.second.m_float_values.size());
if (count == 1)
shader_source += StringFromFormat("\tfloat o_%s;\n", it.first.c_str());
else