mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-13 22:40:29 +02:00
Cleanup initialization order.
This commit is contained in:
1 parent
a32cf817ff
commit
9608067ca2
3 files changed
+7
-8
No files matched your search
@@ -687,14 +687,14 @@ static int getExpCurveAt(int index, int duration) {
|
||||
|
||||
ADSREnvelope::ADSREnvelope()
|
||||
: attackRate(0),
|
||||
attackType(PSP_SAS_ADSR_CURVE_MODE_LINEAR_INCREASE),
|
||||
decayRate(0),
|
||||
decayType(PSP_SAS_ADSR_CURVE_MODE_LINEAR_DECREASE),
|
||||
sustainRate(0),
|
||||
sustainType(PSP_SAS_ADSR_CURVE_MODE_LINEAR_INCREASE),
|
||||
releaseRate(0),
|
||||
releaseType(PSP_SAS_ADSR_CURVE_MODE_LINEAR_DECREASE),
|
||||
attackType(PSP_SAS_ADSR_CURVE_MODE_LINEAR_INCREASE),
|
||||
decayType(PSP_SAS_ADSR_CURVE_MODE_LINEAR_DECREASE),
|
||||
sustainType(PSP_SAS_ADSR_CURVE_MODE_LINEAR_INCREASE),
|
||||
sustainLevel(0x100),
|
||||
releaseType(PSP_SAS_ADSR_CURVE_MODE_LINEAR_DECREASE),
|
||||
state_(STATE_OFF),
|
||||
steps_(0),
|
||||
height_(0) {
|
||||
|
||||
@@ -71,7 +71,7 @@ Shader::~Shader() {
|
||||
}
|
||||
|
||||
LinkedShader::LinkedShader(Shader *vs, Shader *fs, bool useHWTransform)
|
||||
: program(0), dirtyUniforms(0), useHWTransform_(useHWTransform) {
|
||||
: useHWTransform_(useHWTransform), program(0), dirtyUniforms(0) {
|
||||
program = glCreateProgram();
|
||||
glAttachShader(program, vs->shader);
|
||||
glAttachShader(program, fs->shader);
|
||||
|
||||
+2
-3
@@ -181,7 +181,7 @@ void PathBrowser::Navigate(const std::string &path) {
|
||||
if (path_.size() == 3 && path_[1] == ':') {
|
||||
path_ = "/";
|
||||
} else {
|
||||
int slash = path_.rfind('/', path_.size() - 2);
|
||||
size_t slash = path_.rfind('/', path_.size() - 2);
|
||||
if (slash != std::string::npos)
|
||||
path_ = path_.substr(0, slash + 1);
|
||||
}
|
||||
@@ -212,9 +212,8 @@ private:
|
||||
UI::EventReturn GameButtonClick(UI::EventParams &e);
|
||||
UI::EventReturn NavigateClick(UI::EventParams &e);
|
||||
|
||||
|
||||
bool allowBrowsing_;
|
||||
PathBrowser path_;
|
||||
bool allowBrowsing_;
|
||||
};
|
||||
|
||||
GameBrowser::GameBrowser(std::string path, bool allowBrowsing, UI::LayoutParams *layoutParams)
|
||||
|
||||
Reference in new issue
Block a user